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

[fenris02]

commit ee913c01199330c938d0a8aa746e292911cc1ceb
Merge: 8525a87 cb4ccbe
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Tue Sep 24 13:12:36 2013 -0500

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

 munin.spec |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletions(-)
---