dragging items in catalog manager, keeping link orders in the network library, subTree => subtree
dragging items in catalog manager, keeping link orders in the network library, subTree => subtree
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
cs-catalogs-reorder branch has gone
Merge branch 'beta' into beta-ics
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
'icons' catalog has gone
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
list views: scrolling speed optimization
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/CancelActivity.java
Merge branch 'beta' into beta-ics