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

[fenris02]

commit 7f737aa2456e2a9c8f2b0e8fc55bcaf69f3d5141
Merge: f8698d3 b1b34af
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Fri May 10 20:52:46 2013 -0500

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

 .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(-)
---