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

[Rex Dieter]

commit aa228859802cc7c1f7ab3f09d835c10b397aeb2a
Merge: 415d5da cd50ef8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:10:22 2014 -0500

    Merge branch 'master' into f20

 kdeedu.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---