[PyMunin/el6: 2/2] Merge branch 'master' into el6

[Matthias Runge]

commit f1998a1d6ad4600e5e45f67a19741e9146e07073
Merge: 509af2f eaf1ce8
Author: Matthias Runge <mrunge at matthias-runge.de>
Date:   Mon Jun 25 12:49:28 2012 +0200

    Merge branch 'master' into el6

 .gitignore   |    1 +
 PyMunin.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---