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

[Rex Dieter]

commit d4b1223413be83b198d598841d3dc31b88b1e802
Merge: c4f01e8 ef12e42
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 28 17:55:57 2012 -0600

    Merge branch 'f18' into f17

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