OSDN Git Service

Resolved merge conflict
authordaigo <beatles@users.sourceforge.jp>
Sat, 24 Jul 2010 03:54:36 +0000 (12:54 +0900)
committerDaigo Moriwaki <daigo@debian.org>
Sat, 24 Jul 2010 03:54:36 +0000 (12:54 +0900)
commit2da79bca4e0c25714cc4e7b74fa17f859c83183a
treec0fa08fb30e67bf0d1007a4d0d9e63aaea86a180
parent046c4bddc11f38a1c24924f7a9a57d4745d405cd
parentcd3b4625cb8625594744999cbac91e0001368392
Resolved merge conflict
changelog