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)
commitb57bdd6a96e07c3871a86e928f6cf7b40d3d0880
tree0fdffd5d799b1886c7400413081a48e6634eeacb
parentad579827af1a7b027f7991efe2f27fd80c4244db
parented9639977caa958ffd6008dfe14fa3b1795368ce
Merge branch 'master' of git://timeoutd.org/jmdict