6bbba1 Merge branch 'master' into epel7

Merged and Committed by Christopher Meng 9 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	autoconf-archive.spec
    
        
file modified
+2 -0
file modified
+19 -25
file modified
+1 -1