3a381d0 Merge branch 'master' into epel7

Merged and Committed by Jan-Frode Myklebust 9 years ago
    Merge branch 'master' into epel7
    
        
file modified
+2 -0
file modified
+2 -2
file modified
+4 -1