local changes
Merge branch 'master' of https://github.com/RaD/dokuwiki-seqdia

Conflicts:
	syntax.php