35c1369 Merge branch 'master' into epel7

Merged and Committed by cicku 9 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	ascii-design.spec
    
        
file modified
+2 -0
file modified
+21 -13
file modified
+1 -2