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

Xuu committed 2016-02-02 17:56:04 +0000 commit 4bdbe2e9cc323cc13dbbf481f5c79f5224636556