OSDN Git Service

Merge branch 'branch_0.12.0'
authorAtsushi Konno <atkonn@gmail.com>
Tue, 6 Oct 2009 16:50:51 +0000 (01:50 +0900)
committerAtsushi Konno <atkonn@gmail.com>
Tue, 6 Oct 2009 16:50:51 +0000 (01:50 +0900)
Conflicts:
configure
configure.ac
include/config.h
support/centos/mod-chxj.spec


Trivial merge