[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=25e9967

The following commit has been merged in the master branch:
commit 25e9967c36141ab3cd6d0135e151e5504f996f6f
Merge: cc73c50a1efda457271de2ae0673d35e32747fd1 906704d8f796d7286b4b2d5adb7892e82c5d6255
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 08:03:35 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index 3e094d7,0ef2ba4..c783c4f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ 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 ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:08:15 +0200
 +
  kdnssd-kf5 (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kdnssd packaging