bookshelf plugin link disabled
reset hash received from the server
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into microtypography
VERSION => 2.1.9
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
Merge branch 'ice-cream-sandwich' into microtypography
updated ChangeLog
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into microtypography
2.1.8.1

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
updated some German strings
Merge pull request #254 from MaDill/master

updated some German strings
Merge branch 'master' of github.com:geometer/FBReaderJ
updated ChangeLog
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into microtypography