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

[Remi Collet]

commit af6a25ef4a7ff1bffdd928ae45aec45a989d959f
Merge: 610a74f 240dbed
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Jan 30 16:48:38 2013 +0100

    Merge branch 'master' into el6

 .gitignore           |    1 +
 sources              |    2 +-
 wordpress-httpd-conf |    7 +++++++
 wordpress.spec       |   21 ++++++++++++++++-----
 4 files changed, 25 insertions(+), 6 deletions(-)
---