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

[fenris02]

commit 1c531115bde5c244f0cc8a00cc89e7114c78caab
Merge: a693bc8 76c647f
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Fri Oct 19 21:01:36 2012 -0500

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

 munin-2.0-defect-1213.patch |   22 ++++++++++++++++++++++
 munin.spec                  |   34 +++++++++++++++++++++-------------
 2 files changed, 43 insertions(+), 13 deletions(-)
---