[wordpress/el6: 2/2] Merge branch 'master' into el6

[Matej Cepl]

commit 6f939cdc1d03fd05eb6471fa0e26031dcc7439ab
Merge: d7fd454 1673b03
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Thu Jan 5 11:44:36 2012 +0100

    Merge branch 'master' into el6

 .gitignore     |    1 +
 sources        |    2 +-
 wordpress.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc wordpress.spec
index fdbf686,a90049c..e3a24b9
--- a/wordpress.spec
+++ b/wordpress.spec
@@@ -4,9 -4,9 +4,9 @@@
  Summary: Blog tool and publishing platform
  URL: http://www.wordpress.org
  Name: wordpress
- Version: 3.3
+ Version: 3.3.1
  Group: Applications/Publishing
 -Release: 1%{?dist}
 +Release: 2%{?dist}
  License: GPLv2
  Source0: http://wordpress.org/%{name}-%{version}.tar.gz
  Source1: wordpress-httpd-conf