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

[Rex Dieter]

commit ddf9b6ed513dd1e6ed994902785303634d081aff
Merge: 8450bc1 16985b8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 15:30:37 2012 -0500

    Merge branch 'f17' into f16

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