[SCM] kate packaging branch, kde4.11, updated. debian/4.10.5-2-5-g320cf8e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kate.git;a=commitdiff;h=320cf8e

The following commit has been merged in the kde4.11 branch:
commit 320cf8e07f087215b307ac9fe67cc958c962328e
Merge: 040d79f807708df84e9d77fd4f4f456d5cf9a374 0c86fa1eae1287afab5309c3f455175add0700b0
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Sep 25 15:24:03 2013 +0200

    Merge remote-tracking branch 'origin/master' into kde4.11
    
    Conflicts:
    	debian/changelog

 debian/changelog |    7 ++++++-
 debian/control   |    1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index f64cf6f,d8ae19e..be9c4b0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,14 @@@
 -kate (4:4.10.5-3) UNRELEASED; urgency=low
 +kate (4:4.11.1-0r0) UNRELEASED; urgency=low
 +
 +  * New upstream release.
++
++  [ Maximiliano Curia ]
 +  * Update install files.
  
-  -- Maximiliano Curia <maxy at debian.org>  Tue, 03 Sep 2013 20:18:45 +0200
+   [ Pino Toscano ]
+   * Fix section of libkatepartinterfaces4 to be "libs".
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 10 Sep 2013 12:12:36 +0200
  
  kate (4:4.10.5-2) unstable; urgency=low
  

-- 
kate packaging