Merge branch 'master' of github.com:koreader/koreader

Conflicts:
	Makefile
pull/8/head
Qingping Hou 11 years ago
commit 969f98a61f

Diff Content Not Available