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

[Rex Dieter]

commit db02c7cd489c73c1c95068904d272f163ec3555c
Merge: 4d25290 49859de
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 13:14:57 2012 -0500

    Merge branch 'f18' into f17

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