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

[fenris02]

commit 96ddbf978cbb9b093a1e6c3e03b0683a5a998a46
Merge: 0b5fe15 2bdf8bd
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Jun 1 16:36:44 2013 -0500

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

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