OSDN Git Service

Merge branch '201312-usiToCsa'
authorDaigo Moriwaki <daigo@debian.org>
Sat, 22 Feb 2014 12:54:41 +0000 (21:54 +0900)
committerDaigo Moriwaki <daigo@debian.org>
Sat, 22 Feb 2014 12:54:41 +0000 (21:54 +0900)
commitcd9bfae56a0c922ac2c82895ad4765364b597738
tree8b6d038c1c88c71ffcdb34017d5b3598468faba6
parentd7dc48d302a0b0ffaeba2f7a05099912e148a1c6
parentf565a12329d70a6917348483d655b5e9bd383ee0
Merge branch '201312-usiToCsa'

Conflicts:
changelog
changelog