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

[fenris02]

commit 320da9d4b4da7f925a3e4b52601209e69362e2e3
Merge: de05212 59755f5
Author: d. johnson <fenris02 at fedoraproject.org>
Date:   Wed Nov 26 13:32:02 2014 -0600

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

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