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

[fenris02]

commit e84df1b84d12a035a5616d32a9d3fc5befde38cf
Merge: e638739 1d6f66a
Author: d. johnson <fenris02 at fedoraproject.org>
Date:   Fri Mar 28 19:21:48 2014 -0500

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

 .gitignore                    |    1 +
 munin-2.0.19.tar.gz.sha256sum |    1 -
 munin-2.0.20.tar.gz.sha256sum |    1 +
 munin.spec                    |   15 +++++++++------
 sources                       |    2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)
---