[wordpress/f14: 4/4] Merge branch 'master' into f14

[Matej Cepl]

commit 9f239cfc8190c9ebd5217d3971715145cd9435d7
Merge: ad03712 bdc74d9
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Jul 5 11:02:25 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	sources
    	wordpress.spec

 .gitignore     |    1 +
 sources        |    2 +-
 wordpress.spec |    9 ++++-----
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index d002ba8,53965d3..5e26a59
--- a/.gitignore
+++ b/.gitignore
@@@ -6,4 -6,6 +6,5 @@@ wordpress-3.0.1.tar.g
  /wordpress-3.1.1.tar.gz
  /wordpress-3.1.2.tar.gz
  /wordpress-3.1.3.tar.gz
 -/wordpress-3.2-RC1.zip
 -/wordpress-3.2-RC3.zip
 +/wordpress-3.1.4.tar.gz
+ /wordpress-3.2.tar.gz
diff --cc wordpress.spec
index 9cf4af2,5a71d81..50743e7
--- a/wordpress.spec
+++ b/wordpress.spec
@@@ -107,8 -103,14 +103,11 @@@ rm -rf ${RPM_BUILD_ROOT
  %dir %{_sysconfdir}/wordpress
  
  %changelog
+ * Tue Jul 05 2011 Matěj Cepl <mcepl at redhat.com> - 3.2-1
+ - New upstream release.
+ 
 -* Wed Jun 29 2011 Matěj Cepl <mcepl at redhat.com> - 3.2-0.1.RC3
 -- Updated prerelease version (security and minor fixes).
 -
 -* Sun Jun 19 2011 Matěj Cepl <mcepl at redhat.com> - 3.2-0.1.RC1
 -- Prerelease version.
 +* Wed Jun 29 2011 Matěj Cepl <mcepl at redhat.com> - 3.1.4-1
 +- New upstream security release.
  
  * Thu Jun 02 2011 Matěj Cepl <mcepl at redhat.com> - 3.1.3-3
  - Actually, we just don't need gettext.php at all, it is provided by