[SCM] khtml packaging branch, kubuntu_unstable, updated. ubuntu/5.15.0-0ubuntu2-2-g3847fbd

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 3847fbd3af12c4e628465b592dddbed0d6cb7f8c
Merge: 8b377f6124f25e9565d6f97692883436ea910d91 e52514a2b2ac75aa4b25ea61aa27ca4a4a9bf1af
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 19:53:26 2015 -0800

    Fix merge madness

 debian/changelog     | 6 +++---
 debian/tests/control | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

-- 
khtml packaging