Merge branch 'master' of thinkbase.srv.welterde.de:projects/dn42/wiki/public

dn42 wiki committed 2014-12-20 18:36:03 +0100 commit a526cbd1f88c08ae41976d744600e881afe70daa