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

[Matej Cepl]

commit d13d828b55e463a685db1ac4acd939f7ff4a4753
Merge: d0926c3 c3a27fd
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Thu Jun 28 21:39:42 2012 +0200

    Merge branch 'f15' into el6

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