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

[Rex Dieter]

commit 8c4dd27c1e8f648be3fe2598c0df074129d85038
Merge: 96006a9 553eee0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:31:58 2014 -0500

    Merge branch 'master' into f20

 kdesdk.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---