[SCM] kate packaging branch, master, updated. debian/4.11.5-1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 508dc8758ed4b54c9543c63f3dc2a1499f9af86c
Merge: 82f6d022635d8ec1255797190b6fdb88c88dc685 c1dcbc9f8eb7b4eedf15afcf2d464f26cf8c7c6c
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Dec 30 10:54:38 2013 -0300

    Merge branch 'master' of git://git.debian.org/pkg-kde/kde-sc/kate
    
    Conflicts:
    	debian/changelog

 debian/changelog |  5 ++++-
 debian/control   | 14 +++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index e931d8d,f1fd098..5c3f188
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,11 @@@
 -kate (4:4.11.3-3) UNRELEASED; urgency=low
 +kate (4:4.11.4-1) UNRELEASED; urgency=low
  
 +  * New upstream release.
 +
-  -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Dec 2013 16:07:31 +0100
++  [ Sune Vuorela ]
+   * Update package descriptions. (Closes: #731894)
+ 
+  -- Sune Vuorela <sune at debian.org>  Wed, 11 Dec 2013 08:13:03 +0100
  
  kate (4:4.11.3-2) unstable; urgency=low
  

-- 
kate packaging