From efbb88feee52d96ca266485ea2e9d79ce54ff39a Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 06 Jun 2014 10:41:28 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5

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

diff --git a/interface/web/admin/lib/lang/de_tpl_default_admin.lng b/interface/web/admin/lib/lang/de_tpl_default_admin.lng
index 5249447..9767400 100644
--- a/interface/web/admin/lib/lang/de_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/de_tpl_default_admin.lng
@@ -15,4 +15,4 @@
 $wb['php_fpm_init_script_txt'] = 'Pfad zum PHP-FPM Init Script';
 $wb['php_fpm_ini_dir_txt'] = 'Pfad zum php.ini Verzeichnis';
 $wb['php_fpm_pool_dir_txt'] = 'Pfad zum PHP-FPM Pool Verzeichnis';
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1