Merge branch 'f18'

Conflicts:
	.gitignore
	sources
	wordpress.spec
This commit is contained in:
Adam Williamson 2013-08-23 16:55:02 -07:00
commit d9051ff465

1
.gitignore vendored
View file

@ -39,3 +39,4 @@ wordpress-3.0.1.tar.gz
/wordpress-3.5.1.tar.gz
/wordpress-3.5.2.tar.gz
/wordpress-3.6.tar.gz