commit 9b325f606fcfdf012deee8e910b4b4cb8d105a2b Merge: ef0017e 8958e5c Author: Than Ngo <than at redhat.com> Date: Thu Dec 6 15:44:04 2012 +0100 Merge branch 'f18' into f17 .gitignore | 1 + libkdeedu.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---