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

[Rex Dieter]

commit 415d5da9fbb8c1dbca2b22dbcf58aa1a239bc853
Merge: 5dae951 24d5cab
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:28:42 2014 -0500

    Merge branch 'master' into f20

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