[SCM] kded packaging branch, master, updated. debian/5.37.0-2-77-g4322ba8

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kded.git;a=commitdiff;h=20e4f31

The following commit has been merged in the master branch:
commit 20e4f319b77ba4dcf3cceae6ba88da62877756b9
Merge: 7b42c814e2373cb25ecda748aa3157a96611d223 1b9da0731faa4b87f96420bfabcc11e759bca16e
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 09:59:08 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_vivid_backports' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc debian/changelog
index c0cc74b,d534388..5529c60
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ kded (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:12:20 -0700
+ 
 +kded (5.11.0-1) unstable; urgency=medium
 +
 +  * New upstream release (5.10.0).
 +  * New upstream release (5.11.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 12:35:55 +0200
 +
  kded (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
kded packaging