From 8cf78b31b28b9183579c7939b947e1f7e9f5c2fa Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 12 Jan 2012 04:54:19 -0500
Subject: [PATCH] Merged revisions 2812-2883 from staböe branch.

---
 interface/web/vm/lib/lang/fr_openvz_action.lng |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/interface/web/vm/lib/lang/fr_openvz_action.lng b/interface/web/vm/lib/lang/fr_openvz_action.lng
index cb3194a..52f7328 100644
--- a/interface/web/vm/lib/lang/fr_openvz_action.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_action.lng
@@ -14,5 +14,3 @@
 $wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that name.';
 $wb['ostemplate_exec_txt'] = 'The command to create a OSTemplate has been sent to the host server. It will take several minutes until the OSTemplate has been created.';
 ?>
-
-

--
Gitblit v1.9.1