[libkdeedu/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit dc11ffacc879dad549e5796cbda5346a54ad148a
Merge: a248c81 5fcbc4d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 06:43:31 2013 -0500

    Merge branch 'master' into f19

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