commit e153eb0f94530780ee2bb5dd7a69399fe49548dc Merge: 9f239cf 4214abd Author: Matěj Cepl <mcepl at redhat.com> Date: Tue Jul 5 11:04:43 2011 +0200 Merge branch 'f15' into f14 Conflicts: .gitignore sources wordpress.spec ---