From f79aa1ba7536aaf5fba3f55bc52181b8d3355a03 Mon Sep 17 00:00:00 2001
From: Naeltard <t.rechel@gmx.de>
Date: Fri, 23 Jan 2015 17:21:11 +0100
Subject: [PATCH] Merge branch 'master' of mojotrollz.eu:hosting

Conflicts:
	Neopolimatrix/neopolimatrix/page/default_page/tpl/default_page.tpl
---
 system | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system b/system
index bde461b..c2f2953 160000
--- a/system
+++ b/system
@@ -1 +1 @@
-Subproject commit bde461ba8c7fed6ab4786bc0429d8b17bc0efca2
+Subproject commit c2f295374bcd0bc149d608534032e786285af799