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

[fenris02]

commit 85f4be72386d386af930482852b08c32be897dcc
Merge: 5039e9f b1b34af
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Fri May 10 20:52:59 2013 -0500

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

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