[kactivities/f17: 9/9] Merge branch 'f18' into f17

[Rex Dieter]

commit 3681be55f0a6a9962e9a53aabcbd6aba94cf0d12
Merge: 819057c 4a7b5e0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Mar 6 16:24:38 2013 -0600

    Merge branch 'f18' into f17

 .gitignore       |    7 +------
 kactivities.spec |   38 ++++++++++++++++++++++++++++++++++----
 sources          |    2 +-
 3 files changed, 36 insertions(+), 11 deletions(-)
---