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

[Rex Dieter]

commit 9a7cf86511a0de2a5c2ed197ec08b3dce0ad86ee
Merge: 2efd923 daa1735
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:49:58 2014 -0500

    Merge branch 'master' into f20

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