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

[fenris02]

commit 565f17576178dc64293b203bb55064f6696aa86e
Merge: 5d6157a 434ea6a
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Feb 2 22:12:26 2013 -0600

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

 .gitignore                    |    1 +
 Makefile.config-dist          |    3 ++-
 munin-2.0.10.tar.gz.sha256sum |    1 -
 munin-2.0.11.tar.gz.sha256sum |    1 +
 munin.spec                    |    8 +++++++-
 sources                       |    2 +-
 6 files changed, 12 insertions(+), 4 deletions(-)
---