[wordpress/f17: 2/3] Merge branch 'master' into f17

[Remi Collet]

commit 4c15a2b494dc5199b28bd65f25f10b2a83dc8d17
Merge: cffcd49 240dbed
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Jan 30 15:55:32 2013 +0100

    Merge branch 'master' into f17

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