commit 462ba513e11e97b3fba2d575aff78e9d0cc9134b Merge: b3072b3 71c2218 Author: Than Ngo <than at redhat.com> Date: Thu Dec 6 15:39:32 2012 +0100 Merge branch 'f18' into f17 .gitignore | 1 + konsole.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) ---