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

[Rex Dieter]

commit d4a70f52c1d17c62be87a9694ad36e83062166c8
Merge: 9b325f6 8342d56
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 28 16:36:00 2012 -0600

    Merge branch 'f18' into f17

 .gitignore     |    1 +
 libkdeedu.spec |    5 ++++-
 sources        |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---