[kdesdk/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit 96006a9630f966dfafac1bdc1b3ac54216ef8889
Merge: ebc64ac 99c53e7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:53:51 2014 -0500

    Merge branch 'master' into f20

 kdesdk.spec |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)
---