[kdeedu/f20: 11/11] Merge branch 'master' into f20

[Rex Dieter]

commit 5dae95170f0d0c1180f7e89ea0cc5d347b0e523b
Merge: 319c501 4fb61cf
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:49:09 2014 -0500

    Merge branch 'master' into f20

 kdeedu.spec |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)
---