[wordpress/el5: 11/11] Merge branch 'master' into el5

[Matej Cepl]

commit 12a32dcef7e4ab033b955bfa71ce7a7410d1750f
Merge: 2e07807 1673b03
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Thu Jan 5 11:43:21 2012 +0100

    Merge branch 'master' into el5

 .gitignore     |    8 +++++++
 sources        |    2 +-
 wordpress.spec |   59 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 60 insertions(+), 9 deletions(-)
---