[SCM] krunner packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-g39607de

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 39607dea77f94e3b3b8fb43af31af7be2a020e63
Merge: 9a8e6c096502b30f65ecc50e099f0d10264235d1 f29975ef032bc32f00ddc3eb3cdead4ecf8d301e
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 07:50:29 2015 +0200

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

 debian/changelog |  7 +++++++
 debian/control   | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index 7b9812e,9987463..0f045ba
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ krunner (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 21:23:04 +0200
+ 
 +krunner (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:10:41 +0200
 +
  krunner (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
krunner packaging