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

[Rex Dieter]

commit 6fafda2e67e98e96b85f8ff427055fcbefc47741
Merge: cd9a7a3 0330257
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jul 14 23:01:45 2014 -0500

    Merge branch 'master' into f20

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