ok
Merge branch 'master' of https://github.com/sanei-dengyo-jyoho/sed-shortcodes

Conflicts:
	readme.txt