9a866b8 Merge branch 'master' into epel7

Merged and Committed by Alejandro Alvarez Ayllon 9 years ago
    Merge branch 'master' into epel7
    
        
file modified
+14 -10
file modified
+1 -1