[munin/epel7: 3/3] Merge remote-tracking branch 'origin/master' into epel7

[fenris02]

commit a429cda5f0f5228e56f70460a1100a9ac24e9fd0
Merge: 45e679b 8091136
Author: d. johnson <fenris02 at fedoraproject.org>
Date:   Sun Oct 26 10:16:42 2014 -0500

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

 .gitignore                    |    1 +
 munin-2.0.23.tar.gz.sha256sum |    1 -
 munin-2.0.24.tar.gz.sha256sum |    1 +
 munin.spec                    |    5 ++++-
 sources                       |    2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)
---