5b7429a Merge branch 'master' into epel7

Merged and Committed by pingou 9 years ago
    Merge branch 'master' into epel7
    
        
file added
+54
file modified
+11 -1