OSDN Git Service

Merge branch 'branch_0.12.0' of konn@git.sourceforge.jp:/gitroot/modchxj/mod_chxj...
authorAtsushi Konno <konn@users.sourceforge.jp>
Wed, 10 Dec 2008 14:49:04 +0000 (23:49 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Wed, 10 Dec 2008 14:49:04 +0000 (23:49 +0900)
commit1cef58a4bfa50d14d2415dd4408b00d096d97328
tree41e8fe096779039e6995b2c66656f32176735390
parent54b8724b36b1721e3d23fdb44319601645bf0cad
parent35d87b8f94c8ab676606bef30911c456e555b48e
Merge branch 'branch_0.12.0' of konn@git.sourceforge.jp:/gitroot/modchxj/mod_chxj into branch_0.12.0

Conflicts:
etc/emoji.xml