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

[Remi Collet]

commit 0f3ef8038778fd1d0c62857e1b5171a6d8508566
Merge: 73d9147 240dbed
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Jan 30 16:17:02 2013 +0100

    Merge branch 'master' into f16

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