Merge branch 'master' of gitorious.org:kate/kate master
authorChristoph Cullmann <cullmann@kde.org>
Tue, 6 Jul 2010 19:03:33 +0000 (21:03 +0200)
committerChristoph Cullmann <cullmann@kde.org>
Tue, 6 Jul 2010 19:03:33 +0000 (21:03 +0200)
commitb6be19408cc0d232fb2e303e0f3cc58e37da1bdd
tree7bbf3a74ee4c267951918765082e03fa8abfd9c1
parent47a66717e296b5af813ac0aabac3efbc44084e3f
parent49cf9a30816ff1a87ed350d007c8a28bfaa8943a
Merge branch 'master' of gitorious.org:kate/kate