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

[Christof Damian]

commit 8d7b0695bc244b1672e161045f0fd1685ee6c6c7
Merge: 0a1dc62 4d5430e
Author: Christof Damian <christof at damian.net>
Date:   Thu Jul 25 16:22:50 2013 +0200

    Merge branch 'master' into f19

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