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

[Christof Damian]

commit 70d636a9658a49218c744149c3cba8536e25f784
Merge: 3963f5f 4d5430e
Author: Christof Damian <christof at damian.net>
Date:   Thu Jul 25 16:33:30 2013 +0200

    Merge branch 'master' into el6

 .gitignore   |    2 +-
 mod_qos.spec |   10 ++++++++--
 sources      |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---