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

[fenris02]

commit 14d0776cfbbf4284fb185919b26104ee019645b7
Merge: 96ddbf9 ffcfc65
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Tue Jun 4 08:05:20 2013 -0500

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

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