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

[fenris02]

commit 727645e55a594916dae4884b046a1e1ff19c1ca1
Merge: d96d2da 47f6d9c
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Thu Dec 20 22:05:28 2012 -0600

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

 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(-)
---