Merge branch 'branch_0.12.0'

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

Sat, 13 Dec 2008 08:11:52 +0000 (17:11 +0900)

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

Sat, 13 Dec 2008 08:11:52 +0000 (17:11 +0900)
author Atsushi Konno <konn@users.sourceforge.jp>
Sat, 13 Dec 2008 08:11:52 +0000 (17:11 +0900)
committer Atsushi Konno <konn@users.sourceforge.jp>
Sat, 13 Dec 2008 08:11:52 +0000 (17:11 +0900)
diff --cc src/chxj_tag_util.c
Simple merge
diff --cc src/mod_chxj.c
Simple merge
author	Atsushi Konno <konn@users.sourceforge.jp>
	Sat, 13 Dec 2008 08:11:52 +0000 (17:11 +0900)
committer	Atsushi Konno <konn@users.sourceforge.jp>
	Sat, 13 Dec 2008 08:11:52 +0000 (17:11 +0900)
		1	2
src/chxj_tag_util.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mod_chxj.c	patch \|	diff1 \|	diff2 \|	blob \| history