commit d0926c3531e1d50105ff9d6f64a7bfde6169b8bc Merge: 374b88d ef7ca4b Author: Matěj Cepl <mcepl at redhat.com> Date: Thu Jun 14 01:10:41 2012 +0200 Merge branch 'f15' into el6 .gitignore | 3 +-- sources | 2 +- wordpress.spec | 15 +++++++++++---- 3 files changed, 13 insertions(+), 7 deletions(-) ---