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

[fenris02]

commit 37af90d6b973f8805526b26f0d7224693bf47265
Merge: e03d722 2bdf8bd
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Jun 1 16:35:33 2013 -0500

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

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