[munin/el5: 7/7] Merge remote-tracking branch 'origin/master' into el5

[fenris02]

commit bfb5c20250035ec2668baf3a86d990aaa893ac37
Merge: 2a3fa2d 6ec3cb5
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Dec 8 11:42:34 2012 -0600

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

 .gitignore                   |    1 +
 httpd_munin-cgi.conf         |   91 +++++++++++++++++++++--------------------
 munin-2.0.8.tar.gz.sha256sum |    1 -
 munin-2.0.9.tar.gz.sha256sum |    1 +
 munin-node.logrotate         |    3 +-
 munin.logrotate              |   52 +++++++++++++-----------
 munin.spec                   |   51 ++++++++++++++++++++----
 sources                      |    2 +-
 8 files changed, 123 insertions(+), 79 deletions(-)
---