Update ja.xml DjVu entry
Merge pull request #234 from tamo/patch-4

Update ja.xml DjVu entry
French translation complete
Merge branch 'master' into fr-i18n
Merge pull request #236 from matm/fr-i18n

French translation complete
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
formatting
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
updated ChangeLog
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle