From 559b657f9fc6a5374de9b7b1caf20abd4e308d76 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 13 Oct 2014 06:38:11 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/tools/lib/lang/it_import_ispconfig.lng |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/interface/web/tools/lib/lang/it_import_ispconfig.lng b/interface/web/tools/lib/lang/it_import_ispconfig.lng
index 65ea145..ce47c4d 100644
--- a/interface/web/tools/lib/lang/it_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/it_import_ispconfig.lng
@@ -20,5 +20,4 @@
 $wb['import_forward_txt'] = 'Import forward';
 $wb['import_user_filter_txt'] = 'Import user filter';
 $wb['import_spamfilter_txt'] = 'Import spamfilter';
-
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1