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

[fenris02]

commit e03d7222ec913a5aabb1eb39dc64d519c4a7d5f9
Merge: 9cd7fd9 b1b34af
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Fri May 10 20:52:28 2013 -0500

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

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