[SCM] khtml packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-11-g759d288

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 759d288770d12c9a5dadaea8037566da85ee6b55
Merge: 21e0c35b6c9d77fe38c8b20fa7539d2bf0397c91 684cc30f9d08563d802c0b2104eeaa38db7b67d1
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 31 09:36:45 2015 -0700

    Vivid backport.

 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --cc debian/changelog
index e984b48,32aa0c7..ffa98e7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -10,7 -10,7 +10,9 @@@ khtml (5.12.0-0ubuntu1) UNRELEASED; urg
      - Add a few new optional symbols only leaked with GCC 5
  
    [ Scarlett Clark ]
 +  * Batchpatch symbols files. Removed all MISSING optional symbols. 
+   * Vivid backport. 
++  * Fix merge again. 
  
   -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:09:31 -0700
  

-- 
khtml packaging