f63c490 Merge branch 'master' into el6

3 files Merged by nb 13 years ago, Committed by Nick Bebout 13 years ago,
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	wordpress.spec
    
        
file modified
+3 -1
file modified
+1 -1
file modified
+25 -2