[wordpress/f16: 14/14] Merge branch 'master' into f16

[Nick Bebout]

commit 73d914796c52904323ed7ba9e1b262bb8aa4f64a
Merge: 6cea378 db29684
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Jan 11 17:36:15 2013 -0600

    Merge branch 'master' into f16

 .gitignore           |    7 ++++
 sources              |    2 +-
 wordpress-httpd-conf |   11 ++++++
 wordpress.spec       |   98 ++++++++++++++++++++++++++++++++++++++++++++------
 4 files changed, 106 insertions(+), 12 deletions(-)
---
diff --cc .gitignore
index e4c188a,a7c0e8b..175033e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,36 +1,8 @@@
 -wordpress-3.0.1.tar.gz
 -/wordpress-3.0.2.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
 -/wordpress-3.1.3.tar.gz
 -/wordpress-3.2-RC1.zip
 -/wordpress-3.2-RC3.zip
 -/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
 -/wordpress-3.3.1.tar.gz
 -/wordpress-3.4-beta1.tar.gz
 -/wordpress-3.4-beta2.tar.gz
 -/wordpress-3.4-beta3.tar.gz
 -/wordpress-3.4-beta4.tar.gz
 -/wordpress-3.4-RC1.tar.gz
 -/wordpress-3.4-RC2.tar.gz
 -/wordpress-3.4-RC3.tar.gz
 -/wordpress-3.4.tar.gz
 -/wordpress-3.4.1.tar.gz
  /wordpress-3.4.2.tar.gz
+ /wordpress-3.5-beta-1.tar.gz
+ /wordpress-3.5-beta2.tar.gz
+ /wordpress-3.5-beta3.tar.gz
+ /wordpress-3.5-RC1.tar.gz
+ /wordpress-3.5-RC2.tar.gz
+ /wordpress-3.5-RC3.tar.gz
+ /wordpress-3.5.tar.gz