[SCM] khtml packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-5-g21633b5

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 21633b5c2d3a1387925533186b075accfbc8215d
Merge: 41bb7c3473b0d4cb995115232c04391c6e3e88ea c21e8576144ee6b1458a12bf666e6fd104329f85
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 10:55:32 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 b9a86b1,161fbb8..4b6f26d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,9 +1,20 @@@
+ khtml (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:18:39 -0700
+ 
 +khtml (5.11.0-1) unstable; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +  * New upstream release (5.11.0).
 +
 +  [ Felix Geyer ]
 +  * Update the symbols file.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 14:55:30 +0200
 +
  khtml (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
khtml packaging