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

[fenris02]

commit 177261b8da598756d9d8d5838d40b569b7354672
Merge: 8d6df35 91ff89d
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Wed Jan 9 11:43:44 2013 -0600

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

 .gitignore                    |    1 +
 munin-2.0.10.tar.gz.sha256sum |    1 +
 munin-2.0.9.tar.gz.sha256sum  |    1 -
 munin.spec                    |   21 ++++++++++++++-------
 sources                       |    2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)
---