Merge branch 'branch_0.12.0'

author Atsushi Konno <konn@users.sourceforge.jp>

Tue, 7 Apr 2009 13:35:55 +0000 (22:35 +0900)

committer Atsushi Konno <konn@users.sourceforge.jp>

Tue, 7 Apr 2009 13:35:55 +0000 (22:35 +0900)
author Atsushi Konno <konn@users.sourceforge.jp>
Tue, 7 Apr 2009 13:35:55 +0000 (22:35 +0900)
committer Atsushi Konno <konn@users.sourceforge.jp>
Tue, 7 Apr 2009 13:35:55 +0000 (22:35 +0900)
diff --cc include/mod_chxj.h
Simple merge
diff --cc src/mod_chxj.c
Simple merge
author	Atsushi Konno <konn@users.sourceforge.jp>
	Tue, 7 Apr 2009 13:35:55 +0000 (22:35 +0900)
committer	Atsushi Konno <konn@users.sourceforge.jp>
	Tue, 7 Apr 2009 13:35:55 +0000 (22:35 +0900)
		1	2
include/mod_chxj.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mod_chxj.c	patch \|	diff1 \|	diff2 \|	blob \| history