commit 374b88d468432a5e8594ca5d83db6750bdb67ca8 Merge: 6f939cd 2710f16 Author: Matěj Cepl <mcepl at redhat.com> Date: Mon Apr 23 13:56:47 2012 +0200 Merge branch 'f17' into el6 .gitignore | 1 + sources | 2 +- wordpress.spec | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) ---