e152f56 Merge branch 'master' into el6

Merged and Committed by Jon Ciesla 13 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	wordpress.spec
    
        
file modified
+2 -0
file modified
+1 -1
file modified
+17 -4