more => all
unix end-of-line, @Override
unix end-of-line, @Override
Merge branch 'master' into ice-cream-sandwich
end-of-line
Merge branch 'ice-cream-sandwich' into ics-litres

Conflicts:
	src/org/amse/ys/zip/NoCompressionDecompressor.java
cleanup
cleanup

Conflicts:
	src/android/patches/JellyBeanSpanFixTextView.java
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into ics-litres

Conflicts:
	src/android/patches/JellyBeanSpanFixTextView.java
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/android/fbreader/covers/CoverManager.java
	src/org/geometerplus/android/fbreader/image/ImageViewActivity.java
	src/org/geometerplus/android/fbreader/network/AuthenticationActivity.java
	src/org/geometerplus/android/fbreader/network/AuthorizationMenuActivity.java
	src/org/geometerplus/android/fbreader/network/BuyBooksActivity.java