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

[Rex Dieter]

commit 4998b51e5b0ecbfec4f7052b9aefefce79ce3135
Merge: 9a7cf86 5e8be01
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:29:14 2014 -0500

    Merge branch 'master' into f20

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