[wordpress/f14: 11/11] Merge branch 'f13' into f14

[Matej Cepl]

commit ad037120e11276e804e641125c790d408d7be509
Merge: e8bc259 73aa093
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Jun 29 21:33:57 2011 +0200

    Merge branch 'f13' into f14

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