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

[fenris02]

commit 6170d912886d826738807eda9b5b3db34ab8da51
Merge: ee913c0 191d27b
Author: d. johnson <fenris02 at fedoraproject.org>
Date:   Sat Dec 7 19:17:55 2013 -0600

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

 .gitignore                    |    1 +
 munin-2.0.17.tar.gz.sha256sum |    1 -
 munin-2.0.18.tar.gz.sha256sum |    1 +
 munin.spec                    |   14 ++++++++++++--
 sources                       |    2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)
---