commit 7155aa81a10137f9131634cb082a0bb9e349c5fc Merge: 102d1a2 dbbb71d Author: Than Ngo <than at redhat.com> Date: Thu Dec 6 15:33:22 2012 +0100 Merge branch 'f18' into f17 .gitignore | 1 + kdepim-runtime.spec | 11 ++++++++++- sources | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) ---