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

[fenris02]

commit 4e30f25ba698fed7a2eb251561e1a849375b81d3
Merge: 6170d91 3fb4ba4
Author: d. johnson <fenris02 at fedoraproject.org>
Date:   Sun Dec 8 01:17:20 2013 -0600

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

 .gitignore                    |    1 +
 munin-2.0.18.tar.gz.sha256sum |    1 -
 munin-2.0.19.tar.gz.sha256sum |    1 +
 munin.spec                    |    7 +++++--
 sources                       |    2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)
---