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

[fenris02]

commit 89eb2aa08f3677fb9870e82378d83ab332df7340
Merge: 5291e79 3fb4ba4
Author: d. johnson <fenris02 at fedoraproject.org>
Date:   Sun Dec 8 01:16:15 2013 -0600

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

 .gitignore                    |    1 +
 munin-2.0.18.tar.gz.sha256sum |    1 -
 munin-2.0.19.tar.gz.sha256sum |    1 +
 munin.spec                    |    7 +++++--
 sources                       |    2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)
---