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

[fenris02]

commit 9e7eced528bb25364e2c8663565cd6155b21aeb5
Merge: c523333 ffcfc65
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Tue Jun 4 08:04:20 2013 -0500

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

 .gitignore                    |    1 +
 munin-2.0.15.tar.gz.sha256sum |    1 -
 munin-2.0.16.tar.gz.sha256sum |    1 +
 munin.spec                    |    5 ++++-
 sources                       |    2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)
---