Merge branch 'master' of mojotrollz.eu:hosting

Conflicts:
	webcraft/webcraft/page/default_page/webcraft.tpl
This commit is contained in:
messerbill 2014-06-17 00:17:35 +02:00
parent 1a657759e8
commit 4905c2b6a5

2
system

@ -1 +1 @@
Subproject commit e2edb4dd56c1f7afdcf313c972c81d958b2b6d52
Subproject commit 18a6cd5cdfc2e6a1be71d0d1861c7a0775f3ea8d