Merge branch 'f17' into f15

.gitignore

@@ -16,3 +16,4 @@ wordpress-3.0.1.tar.gz
 /wordpress-3.3-RC2.tar.gz
 /wordpress-3.3.tar.gz
 /wordpress-3.3.1.tar.gz
+/wordpress-3.3.2.tar.gz

sources

@@ -1 +1 @@
-e94894be6e6d213175940ccc14e6c5e4  wordpress-3.3.1.tar.gz
+bb38fa2bcde3b144e1a7fb096cd597a1  wordpress-3.3.2.tar.gz

wordpress.spec

@@ -4,9 +4,9 @@
 Summary: Blog tool and publishing platform
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 3.3.1
+Version: 3.3.2
 Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
@@ -116,7 +116,14 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
-* Wed Jan 04 2012 'Matej Cepl <mcepl@redhat.com>' - 3.3.1-1
+* Mon Apr 23 2012 'Matěj Cepl <mcepl@redhat.com>' - 3.3.2-2
+- Security updates for uploading files.
+  * Fixed CVE-2011-0700: two XSS bug. Affects users of the Author
+    or Contributor role.
+  * Fixed CVE-2011-0701: potential information disclosure of
+    posts through the media uploader.
+
+* Wed Jan 04 2012 'Matěj Cepl <mcepl@redhat.com>' - 3.3.1-1
 - Security (XSS) and maintenance upstream release.
 
 * Tue Dec 13 2011 'Matěj Cepl <mcepl@redhat.com>' - 3.3-1