From b4945ae0c3f4e108090d05b34b3e7df8a753a2ec Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 07 Jul 2014 13:07:17 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/vm/lib/remote.conf.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/vm/lib/remote.conf.php b/interface/web/vm/lib/remote.conf.php
index f92f80b..77222bf 100644
--- a/interface/web/vm/lib/remote.conf.php
+++ b/interface/web/vm/lib/remote.conf.php
@@ -2,4 +2,4 @@
 
 $function_list['vm_openvz'] = 'OpenVZ VM functions';
 
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1