commit f6e9587df4c6301518e2a02ef363ad0e27e8ff97 Merge: 72772ea 7a1582c Author: Lukas Tinkl <lukas at kde.org> Date: Fri Jul 20 14:53:08 2012 +0200 Merge remote-tracking branch 'origin/f17' into f16 apper.spec | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) ---