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

[Rex Dieter]

commit 4c7100ea4d079cf797fafe5e166856f960472cd9
Merge: 163970b 12949ef
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 08:02:18 2014 -0600

    Merge branch 'master' into f20

 kdeedu.spec |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)
---