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

[Rex Dieter]

commit ddb14a81d73a879966242561ed4731aeba4aa979
Merge: 094fae0 e5a8ed1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 16:58:50 2012 -0500

    Merge branch 'f18' into f17

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