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

[fenris02]

commit de0521293d53c3ed1f9841f47196e303a69634ac
Merge: ebe0463 8091136
Author: d. johnson <fenris02 at fedoraproject.org>
Date:   Sun Oct 26 10:15:37 2014 -0500

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

 .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(-)
---