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

[Rex Dieter]

commit f9aad656fcb921b9ed1cea6bde5098c367a424fe
Merge: d4b1223 cab397a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Mar 7 12:06:06 2013 -0600

    Merge branch 'f18' into f17

 .gitignore |    7 +------
 kate.spec  |   60 +++++++++++++++++++++++++++++++++++++-----------------------
 sources    |    2 +-
 3 files changed, 39 insertions(+), 30 deletions(-)
---