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

[Rex Dieter]

commit ad8e0bdfcb5fc70f34032fd30ff4cc616e9fe77e
Merge: 7c9f723 aa6100a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 14:31:55 2012 -0600

    Merge branch 'f18' into f17

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