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

[Than Ngo]

commit c4f01e8cb055f4a9f4f3c105e5af661c72a2a280
Merge: 078fd97 319ba64
Author: Than Ngo <than at redhat.com>
Date:   Fri Dec 7 10:36:13 2012 +0100

    Merge branch 'f18' into f17

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