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

[fenris02]

commit cdeb5c627dc7e7b659c79922e157d7fab57bace9
Merge: 1c53111 ec3f259
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Nov 3 19:30:46 2012 -0500

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

 ...0.2-defect-1245-LimitsOld.pm-notify_alias.patch |   29 +++++
 munin.spec                                         |  120 ++++++++++++++-----
 2 files changed, 117 insertions(+), 32 deletions(-)
---