Merge branch 'branch_0.12.0' into branch_0.13.0

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

Fri, 10 Apr 2009 11:47:27 +0000 (20:47 +0900)

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

Fri, 10 Apr 2009 11:47:27 +0000 (20:47 +0900)
author Atsushi Konno <konn@users.sourceforge.jp>
Fri, 10 Apr 2009 11:47:27 +0000 (20:47 +0900)
committer Atsushi Konno <konn@users.sourceforge.jp>
Fri, 10 Apr 2009 11:47:27 +0000 (20:47 +0900)
diff --cc src/chxj_chtml10.c
Simple merge
diff --cc src/mod_chxj.c
Simple merge
author	Atsushi Konno <konn@users.sourceforge.jp>
	Fri, 10 Apr 2009 11:47:27 +0000 (20:47 +0900)
committer	Atsushi Konno <konn@users.sourceforge.jp>
	Fri, 10 Apr 2009 11:47:27 +0000 (20:47 +0900)
		1	2
src/chxj_chtml10.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mod_chxj.c	patch \|	diff1 \|	diff2 \|	blob \| history