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

[fenris02]

commit aef1e0defc0c876c4a5795f0152ea71f001983d5
Merge: 69c85ee 3a70992
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Feb 9 16:17:33 2013 -0600

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

 .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(-)
---