[SCM] kdewebkit packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-g171e553

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 171e55363e90dabe1e11be1471e994d624ccd9ee
Merge: b57c82388331a0f4b9cad0108eec9c78771e7b55 34f7c5a78a15f10150112a58e6ae8e06012e9444
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 08:05:54 2015 +0200

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

 debian/changelog |  7 +++++++
 debian/control   | 16 ++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index ca17a66,eaa36ad..e883f48
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ kdewebkit (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:36:09 +0200
+ 
 +kdewebkit (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:03:29 +0200
 +
  kdewebkit (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kdewebkit packaging