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

[fenris02]

commit 8431acd66159a01068c53680dc7a5ab9c9d518a0
Merge: f9ee43f 85cc4f3
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Mar 23 18:49:13 2013 -0500

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

 .gitignore                      |    1 +
 munin-2.0.11.1.tar.gz.sha256sum |    1 -
 munin-2.0.12.tar.gz.sha256sum   |    1 +
 munin.spec                      |   46 +++++++++++++++++++++++++++++++++++---
 sources                         |    2 +-
 5 files changed, 45 insertions(+), 6 deletions(-)
---