[SCM] kdewebkit packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-5-gb916ce6

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit b916ce621a2e56a3f298e56b006ae70a58f3c92b
Merge: 171e55363e90dabe1e11be1471e994d624ccd9ee cbc843a79ac2b74a13f3221c1300b2922d6e745a
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 10:32:01 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 e883f48,8b1e857..39906bb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ kdewebkit (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:14:59 -0700
+ 
 +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 ]

-- 
kdewebkit packaging