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

[fenris02]

commit 56fc6a001d5cea0a6bfd4900e7cdc6596371d99d
Merge: cda7dbd 4f306b1
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sun Apr 28 13:08:38 2013 -0500

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

 .gitignore                    |    1 +
 munin-2.0.12.tar.gz.sha256sum |    1 -
 munin-2.0.13.tar.gz.sha256sum |    1 +
 munin-fcgi-graph.rc           |   56 ++++++++++++++++++++++++++
 munin-fcgi-graph.service      |    2 +-
 munin-fcgi-html.rc            |   56 ++++++++++++++++++++++++++
 munin-fcgi-html.service       |    2 +-
 munin.spec                    |   86 ++++++++++++++++++++++++++++++++++------
 nginx_munin.conf              |   49 +++++++++++++++++++++++
 sources                       |    2 +-
 10 files changed, 239 insertions(+), 17 deletions(-)
---