Merge remote-tracking branch 'riseup/master'

Conflicts:
	manifests/client.pp
	manifests/server.pp
	manifests/server/base.pp
	manifests/server/cron/backup.pp
	manifests/server/munin/default.pp
	manifests/server/nagios.pp

1 files changed, 0 insertions, 2 deletions

diff --git a/manifests/client.pp b/manifests/client.pp
index b85265e..c76e906 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -2,7 +2,6 @@
 class mysql::client (
   $manage_shorewall = false
 ) {
-
   case $::operatingsystem {
     debian: { include mysql::client::debian }
     default: { include mysql::client::base }
@@ -11,5 +10,4 @@ class mysql::client (
   if $manage_shorewall {
     include shorewall::rules::out::mysql
   }
-
 }