[kdelibs: 2/2] Merge branch 'f20' into 'master'

[Kevin Kofler]

commit 16107690980f255cc9f3c3cd219590a8f7c24a0e
Merge: 48ec2a9 3d17a45
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Dec 7 05:37:49 2013 +0100

    Merge branch 'f20' into 'master'

 kdelibs-4.11.3-libexecdir.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---