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

[Rex Dieter]

commit 819057c2112aca56abdd6f143843496c8f62ae93
Merge: bd2fa73 652acbf
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 28 16:27:13 2012 -0600

    Merge branch 'f18' into f17

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