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

[fenris02]

commit ebe0463e703d52ef00f9be578e26fc906473885a
Merge: d7614c7 c5de56a
Author: d. johnson <fenris02 at fedoraproject.org>
Date:   Fri Oct 17 20:54:00 2014 -0500

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

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