[mod_qos/el6: 6/6] Merge branch 'master' into el6

[Christof Damian]

commit 3963f5fc9cf9e2a63c8091d80073abbd35aa78c9
Merge: 7644851 0a1dc62
Author: Christof Damian <christof at damian.net>
Date:   Sun Feb 24 00:44:26 2013 +0100

    Merge branch 'master' into el6

 .gitignore   |    6 +++++
 mod_qos.conf |    1 +
 mod_qos.spec |   71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sources      |    1 +
 4 files changed, 79 insertions(+), 0 deletions(-)
---