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

[Than Ngo]

commit bd2fa739efb9d516e4421aa6c608b0142710606b
Merge: ad8e0bd daa15ef
Author: Than Ngo <than at redhat.com>
Date:   Fri Dec 7 10:34:53 2012 +0100

    Merge branch 'f18' into f17

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