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

[fenris02]

commit 688913d97868e62bd0beb27b8531b95dc356a1b7
Merge: 37af90d ffcfc65
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Tue Jun 4 08:03:39 2013 -0500

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

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