37df148 Merge branch 'master' into epel7

Merged and Committed by ohaessler 8 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	terminator.spec
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+15 -9