update
update
update
Merge branch 'master' of git://github.com/sobjornstad/ankidocs
update
Merge branch 'master' into ja

Conflicts:
	changes.txt
[ja] 2.0.26