Merge branch 'master' of git://timeoutd.org/jmdict
authornille <nmeyering@gmail.com>
Sat, 21 Feb 2009 13:41:03 +0000 (14:41 +0100)
committernille <nmeyering@gmail.com>
Sat, 21 Feb 2009 13:41:03 +0000 (14:41 +0100)

Trivial merge