Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix

Conflicts:
	CHANGELOG
This commit is contained in:
Kelson42 2015-01-08 12:55:53 +01:00
commit 229e8fbebc

Diff Content Not Available