From ddb461f596d9f013afe4f215fabc0eabc62b1fb0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 07 Jan 2014 10:28:05 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

---
 install/tpl/server.ini.master |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index d27a3e2..b31d604 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -16,6 +16,8 @@
 loglevel=2
 admin_notify_events=1
 backup_dir=/var/backup
+backup_dir_is_mount=n
+backup_dir_mount_cmd=
 backup_mode=rootgz
 monit_url=
 monit_user=

--
Gitblit v1.9.1