Merge branch 'master' of www.j8takagi.net:/home/git/yacasl2

Conflicts:
	VERSION