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

[Matej Cepl]

commit 210d5da0de831018ddc96b4f1c753dad28397571
Merge: a718507 1673b03
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Thu Jan 5 11:41:46 2012 +0100

    Merge branch 'master' into f15

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