From aa0db84c25206377f3abe1f3df2bb68bab2eabf1 Mon Sep 17 00:00:00 2001
From: Naeltard <t.rechel@gmx.de>
Date: Thu, 19 Jun 2014 16:53:06 +0200
Subject: [PATCH] Merge branch 'master' of mojotrollz.eu:hosting

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

diff --git a/system b/system
index 2b41888..c2f2953 160000
--- a/system
+++ b/system
@@ -1 +1 @@
-Subproject commit 2b418887dd22ed4685b5eafcc2c6e7a4e8638f4a
+Subproject commit c2f295374bcd0bc149d608534032e786285af799