commit
local filez
Merge branch 'master' of ssh://sirius.uberspace.de:/home/wikibt/html/wiki_plugin_folder/doodle-git

Conflicts:
	doodle/syntax.php