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