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

[fenris02]

commit 8525a87474d560b24a0a1e0cd950ab2283c683e6
Merge: 688913d f0ff7f0
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Jul 20 15:16:44 2013 -0500

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

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