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

[fenris02]

commit 6340e31583374bd0fcb8ae77c51ef21d7d8a1f71
Merge: a776b7e 434ea6a
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Feb 2 22:13:03 2013 -0600

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

 .gitignore                    |    1 +
 Makefile.config-dist          |    3 ++-
 munin-2.0.10.tar.gz.sha256sum |    1 -
 munin-2.0.11.tar.gz.sha256sum |    1 +
 munin.spec                    |    8 +++++++-
 sources                       |    2 +-
 6 files changed, 12 insertions(+), 4 deletions(-)
---