4fe8aa8 Merge branch 'master' into el6

Merged and Committed by athmane 9 years ago
    Merge branch 'master' into el6
    
        
file modified
+1 -0
10-mod_qos.conf mod_qos.conf
file renamed
file was renamed with no change to the file
file modified
+65 -8
file modified
+1 -1