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

[fenris02]

commit e638739a01a0f18d7dee13a5bc6a0b54e6deac81
Merge: 4e30f25 689ff00
Author: d. johnson <fenris02 at fedoraproject.org>
Date:   Wed Mar 26 20:59:39 2014 -0500

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

 linux-init.d_munin-asyncd.in |    6 +++++-
 munin.spec                   |   29 ++++++++++++++++-------------
 2 files changed, 21 insertions(+), 14 deletions(-)
---