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

[Matej Cepl]

commit 38915aef40faf6960f8a318c7698a6f883044947
Merge: 73abfe0 7689123
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Jul 13 02:10:56 2011 +0200

    Merge branch 'master' into el6

 .gitignore     |    1 +
 sources        |    2 +-
 wordpress.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---