commit 01a909a7fd804d4e0dc6e2d78c7e65e78f57ec0e Merge: 210d5da 2710f16 Author: Matěj Cepl <mcepl at redhat.com> Date: Mon Apr 23 13:31:54 2012 +0200 Merge branch 'f17' into f15 .gitignore | 1 + sources | 2 +- wordpress.spec | 13 ++++++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) ---