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

[fenris02]

commit d317b5170b9f886b08076fcb332d0c1120331868
Merge: bfb5c20 47f6d9c
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Thu Dec 20 22:04:38 2012 -0600

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

 httpd_munin-cgi.conf            |    4 ++--
 munin-2.0.9_HTMLConfig.pm.patch |   20 ++++++++++++++++++++
 munin-node.logrotate            |    2 +-
 munin.spec                      |   21 ++++++++++++++++++---
 4 files changed, 41 insertions(+), 6 deletions(-)
---