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

[fenris02]

commit 4cf600c1d703ccd485440f627e56557f51adcc6c
Merge: 85f4be7 2bdf8bd
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Jun 1 16:36:21 2013 -0500

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

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