Merge commit 'refs/merge-requests/18' of git://gitorious.org/kate/kate into integration
authorErlend Hamberg <ehamberg@gmail.com>
Mon, 1 Nov 2010 09:43:10 +0000 (10:43 +0100)
committerErlend Hamberg <ehamberg@gmail.com>
Mon, 1 Nov 2010 09:43:10 +0000 (10:43 +0100)
commit689788e5886027405ecda4981c09a1c1688c173c
tree014582f8e632bdeb0e056db9a768a29520a57e7a
parent642300ce6ec82910e3016c7edac61e1c195ede0b
parent7a1937e85cdb69b2fab06e5877c1277b10eb9881
Merge commit 'refs/merge-requests/18' of git://gitorious.org/kate/kate into integration