Merge branch 'master' into f13

.gitignore

@@ -4,3 +4,5 @@ wordpress-3.0.1.tar.gz
 /wordpress-3.0.3.tar.gz
 /wordpress-3.0.4.tar.gz
 /wordpress-3.1.tar.gz
+/wordpress-3.1.1.tar.gz
+/wordpress-3.1.2.tar.gz

sources

@@ -1 +1 @@
-b8a701bbcb3fdd5829fec5d90f223b56  wordpress-3.1.tar.gz
+a2dee4df1cf5e1539ffba2da49a6cfa7  wordpress-3.1.2.tar.gz

wordpress.spec

@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 3.1
+Version: 3.1.2
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -99,6 +99,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/wordpress/wp-signup.php
 
 %changelog
+* Sun May 01 2011 Matěj Cepl <mcepl@redhat.com> - 3.1.2-1
+- New upstream release.
+
+* Tue Apr 12 2011 Matěj Cepl <mcepl@redhat.com> - 3.1.1-1
+- 3.1.1
+
 * Wed Feb 23 2011 Jon Ciesla <limb@jcomserv.net> - 3.1-1
 - 3.1.