[kdeedu/f17: 8/8] Merge branch 'f18' into f17

[Rex Dieter]

commit 94e9b8ed13c4c80e1ceb7c2ea32406476f17257d
Merge: fef8176 42a769e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 09:14:21 2013 -0600

    Merge branch 'f18' into f17

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