Merge branch 'master' into kitagawa_test

author Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>

Sat, 14 May 2011 23:53:42 +0000 (08:53 +0900)

committer Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>

Sat, 14 May 2011 23:53:42 +0000 (08:53 +0900)
author Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Sat, 14 May 2011 23:53:42 +0000 (08:53 +0900)
committer Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Sat, 14 May 2011 23:53:42 +0000 (08:53 +0900)
diff --cc src/luatexja-core.sty
Simple merge
diff --cc src/luatexja-plain.sty
Simple merge
author	Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
	Sat, 14 May 2011 23:53:42 +0000 (08:53 +0900)
committer	Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
	Sat, 14 May 2011 23:53:42 +0000 (08:53 +0900)
		1	2
src/luatexja-core.sty	patch \|	diff1 \|	diff2 \|	blob \| history
src/luatexja-plain.sty	patch \|	diff1 \|	diff2 \|	blob \| history