From 7c2179f4b8604da1167b29ffb92041cf16fc4dbc Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 13 Mar 2014 07:37:47 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

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

diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index 0822d20..427fc8d 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -26,6 +26,7 @@
 munin_url=
 munin_user=
 munin_password=
+monitor_system_updates=y
 
 [mail]
 module=postfix_mysql

--
Gitblit v1.9.1