Merge branch 'merge_immerda' into 'master'

This is my attempt at merging the huge backlog of commits from immerda. I've been pretty verbose about it in redmine so I won't repeat it all here. For details, see:

https://labs.riseup.net/code/issues/4132

1 files changed, 0 insertions, 3 deletions

diff --git a/manifests/client/centos.pp b/manifests/client/centos.pp
deleted file mode 100644
index 3a7151b..0000000
--- a/manifests/client/centos.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class munin::client::centos inherits munin::client::package {
-  include munin::plugins::centos
-}