Merge branch 'master' of dragon:/home/dav/yacasl2

author j8takagi <j8takagi@nifty.com>

Mon, 13 Dec 2010 16:48:02 +0000 (01:48 +0900)

committer j8takagi <j8takagi@nifty.com>

Mon, 13 Dec 2010 16:48:02 +0000 (01:48 +0900)
author j8takagi <j8takagi@nifty.com>
Mon, 13 Dec 2010 16:48:02 +0000 (01:48 +0900)
committer j8takagi <j8takagi@nifty.com>
Mon, 13 Dec 2010 16:48:02 +0000 (01:48 +0900)
diff --cc doc/yacasl2.html
Simple merge
diff --cc doc/yacasl2.texi
Simple merge
author	j8takagi <j8takagi@nifty.com>
	Mon, 13 Dec 2010 16:48:02 +0000 (01:48 +0900)
committer	j8takagi <j8takagi@nifty.com>
	Mon, 13 Dec 2010 16:48:02 +0000 (01:48 +0900)
		1	2
doc/yacasl2.html	patch \|	diff1 \|	diff2 \|	blob \| history
doc/yacasl2.texi	patch \|	diff1 \|	diff2 \|	blob \| history