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

[fenris02]

commit cd15cd8e72521123fb6ae8afb43f57b093a84772
Merge: 16368c1 3a70992
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Feb 9 16:17:42 2013 -0600

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

 .gitignore                      |    1 +
 munin-2.0-defect-1213.patch     |   22 ----------------------
 munin-2.0.11.1.tar.gz.sha256sum |    1 +
 munin-2.0.11.tar.gz.sha256sum   |    1 -
 sources                         |    2 +-
 5 files changed, 3 insertions(+), 24 deletions(-)
---