[SCM] khtml packaging branch, kubuntu_vivid_archive, updated. b427f31ac388c39f80fe4a18cc062f97a7ec9477

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 8f89d93a05b9e4c746cec58ce853c71c805e7908
Merge: 477d18f40d387697995bf1a6551e127d5e8bfd6b 5e7a3d6506e2f4c2da0ffd3588c0906f0c61c59c
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Wed Nov 12 08:58:34 2014 +0000

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive' into HEAD

 debian/changelog |  6 ++++++
 debian/control   | 60 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 36 insertions(+), 30 deletions(-)

-- 
khtml packaging