[libkdeedu/f20: 8/8] Merge branch 'master' into f20

[Rex Dieter]

commit fcb6eb561dc6cf9bf6021382e1549c4ea8f02c46
Merge: 3fe3b44 acc2af7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 13:30:16 2015 -0600

    Merge branch 'master' into f20

 .gitignore     |    2 ++
 libkdeedu.spec |   36 ++++++++++++++++--------------------
 sources        |    2 +-
 3 files changed, 19 insertions(+), 21 deletions(-)
---