Merge branch 'master' of git://timeoutd.org/jmdict