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

[fenris02]

commit 5291e797ccbeb63aac80ab1b6acb1ea51097035c
Merge: 028adbe 191d27b
Author: d. johnson <fenris02 at fedoraproject.org>
Date:   Sat Dec 7 19:16:46 2013 -0600

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

 .gitignore                    |    1 +
 munin-2.0.17.tar.gz.sha256sum |    1 -
 munin-2.0.18.tar.gz.sha256sum |    1 +
 munin.spec                    |   14 ++++++++++++--
 sources                       |    2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)
---