From dbf29d9979fe779e8801685c0132dbee681e15cf Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 01 Jul 2014 12:39:22 -0400
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/Cambra/ispconfig3 into Cambra/ispconfig3-master

---
 interface/web/admin/lib/lang/el_server_php_list.lng |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/interface/web/admin/lib/lang/el_server_php_list.lng b/interface/web/admin/lib/lang/el_server_php_list.lng
index dc697ae..b402fd1 100644
--- a/interface/web/admin/lib/lang/el_server_php_list.lng
+++ b/interface/web/admin/lib/lang/el_server_php_list.lng
@@ -5,4 +5,3 @@
 $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 ?>
-

--
Gitblit v1.9.1