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

[Than Ngo]

commit 573304d52758cc2acc563e24d1420153eb62fa81
Merge: 91e82ca afbfeb3
Author: Than Ngo <than at redhat.com>
Date:   Mon Dec 10 12:25:04 2012 +0100

    Merge branch 'f18' into f17

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