[SCM] kdnssd packaging branch, master, updated. debian/5.37.0-2-77-g54092c9

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit f58d0682026ca7271b62fbc1cee5b8a68ab6e316
Merge: 25e9967c36141ab3cd6d0135e151e5504f996f6f 26b22264f11b2f9983e0062eb473bbf8e153f37a
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 10:37:39 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 c783c4f,328fd2f..95bed59
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ kdnssd-kf5 (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:15:31 -0700
+ 
 +kdnssd-kf5 (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>  Fri, 26 Jun 2015 13:15:50 +0200
 +
  kdnssd-kf5 (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
kdnssd packaging