Merge branch 'master' into el6

.gitignore

@@ -17,3 +17,4 @@ wordpress-3.0.1.tar.gz
 /wordpress-3.3-RC1.tar.gz
 /wordpress-3.3-RC2.tar.gz
 /wordpress-3.3.tar.gz
+/wordpress-3.3.1.tar.gz

sources

@@ -1 +1 @@
-0bb9a6c3bfb96659a2312722f913e8c3  wordpress-3.3.tar.gz
+e94894be6e6d213175940ccc14e6c5e4  wordpress-3.3.1.tar.gz

wordpress.spec

@@ -4,7 +4,7 @@
 Summary: Blog tool and publishing platform
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 3.3
+Version: 3.3.1
 Group: Applications/Publishing
 Release: 2%{?dist}
 License: GPLv2
@@ -116,6 +116,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Wed Jan 04 2012 'Matej 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
 - New upstream release.