[wordpress/f15: 9/9] Merge branch 'master' into f15

[Matej Cepl]

commit a71850787dc01ba1243e1faebb2c07a5535c4f12
Merge: 76e9e26 2fb094f
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Dec 13 00:57:38 2011 +0100

    Merge branch 'master' into f15

 .gitignore     |    6 ++++++
 sources        |    2 +-
 wordpress.spec |   53 +++++++++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 52 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index cfbcde5,a3dee08..765f5a4
--- a/.gitignore
+++ b/.gitignore
@@@ -6,6 -6,13 +6,12 @@@ 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
  /wordpress-3.2.1.tar.gz
+ /wordpress-3.3-beta2.tar.gz
+ /wordpress-3.3-beta3.tar.gz
+ /wordpress-3.3-beta4.tar.gz
+ /wordpress-3.3-RC1.tar.gz
+ /wordpress-3.3-RC2.tar.gz
+ /wordpress-3.3.tar.gz