kate
Merge branch 'master' of https://github.com/tokushima/kate.git

Conflicts:
	kate.php