b924a75 Merge branch 'master' of ssh://pkgs.fedoraproject.org/wordpress

Merged and Committed by mcepl 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/wordpress
    
    Conflicts:
    	wordpress.spec
    
        
file modified
+41 -4