[munin/el6: 5/5] Merge remote-tracking branch 'origin/master' into el6

[fenris02]

commit 0598b2b6472aa9fda775997b4911579c0488ef08
Merge: e900768 191d27b
Author: d. johnson <fenris02 at fedoraproject.org>
Date:   Sat Dec 7 19:17:27 2013 -0600

    Merge remote-tracking branch 'origin/master' into el6

 .gitignore                    |    1 +
 munin-2.0.17.tar.gz.sha256sum |    1 -
 munin-2.0.18.tar.gz.sha256sum |    1 +
 munin.spec                    |   14 ++++++++++++--
 sources                       |    2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)
---