[SCM] KDE PIM module packaging branch, master, updated. debian/4.11.5-1

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim.git;a=commitdiff;h=00c67b0

The following commit has been merged in the master branch:
commit 00c67b0afdb7fe860d1935720f567da9310b98d3
Merge: ae2a0c82b61d8c72fb0afcb21dbcad3f55a7e6dc 45d428f03498fbf2d36c0336134dce4bda3dc00b
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Dec 30 10:50:55 2013 -0300

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

 debian/changelog     | 5 ++++-
 debian/kmail.install | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 0936449,fcf1596..6de2a12
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,11 @@@
 -kdepim (4:4.11.3-2) UNRELEASED; urgency=low
 +kdepim (4:4.11.4-1) UNRELEASED; urgency=low
 +
 +  * New upstream release.
  
-  -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Dec 2013 16:05:36 +0100
+   [ Pino Toscano ]
+   * kmail.install: do not hardcode the minor grantlee version.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 08 Dec 2013 10:26:19 +0100
  
  kdepim (4:4.11.3-1) unstable; urgency=low
  

-- 
KDE PIM module packaging