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

[fenris02]

commit 5745d4e42d970f4e678381bef1260de33b041b4b
Merge: 6df6ba1 bfd6271
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sun Nov 11 14:07:35 2012 -0600

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

 .gitignore                                         |    1 +
 munin-1.4.2-fontfix.patch                          |   16 -----------
 munin-1.4.6-restorecon.patch                       |   11 -------
 ...0.2-defect-1245-LimitsOld.pm-notify_alias.patch |   29 --------------------
 munin-2.0.7-http_loadtime.patch                    |   11 -------
 munin-2.0.7.tar.gz.sha256sum                       |    1 -
 munin-2.0.8.tar.gz.sha256sum                       |    1 +
 munin-fcgi-graph.service                           |    2 +-
 munin-fcgi-html.service                            |    2 +-
 munin.spec                                         |   20 +++++++------
 sources                                            |    2 +-
 11 files changed, 16 insertions(+), 80 deletions(-)
---