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

[Rex Dieter]

commit 37cb890b8e055bbd03b82ec22e42882e3e1d6c4c
Merge: a0c2f5e 1a2c03b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:18:00 2013 -0500

    Merge branch 'master' into f19

 kdeedu.spec |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)
---