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

[fenris02]

commit 51080cf30ecd3788cc649e5d186763d40799e1b9
Merge: 5745d4e 08d466b
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Thu Nov 29 22:47:52 2012 -0600

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

 httpd_munin-cgi.conf     |   45 +++++++++++++++++++++++
 munin-2.0.8-cgitmp.patch |   91 ++++++++++++++++++++++++++++++++++++++++++++++
 munin.spec               |   36 +++++++++++++++++-
 3 files changed, 170 insertions(+), 2 deletions(-)
---