Merge branch 'master' of git://timeoutd.org/jmdict
authornille <nmeyering@gmail.com>
Tue, 24 Feb 2009 17:26:46 +0000 (18:26 +0100)
committernille <nmeyering@gmail.com>
Tue, 24 Feb 2009 17:26:46 +0000 (18:26 +0100)
commit3af70e42b4392395698aa9221f2f9ac4f06e54ae
treea8e11f6c235a119a130e394150912a31983c5aae
parentb57bdd6a96e07c3871a86e928f6cf7b40d3d0880
parent96518ac67ffdeb599a7fdf2d84fb50fd040b8554
Merge branch 'master' of git://timeoutd.org/jmdict