[SCM] kio packaging branch, kubuntu_wily_backports, updated. ubuntu/5.15.0-0ubuntu3-52-ga3d838d

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit a885eb417ec1f5161d977526e8efa70acf0f0e15
Merge: 29a6265b774255b49f2c093179a6488581da1c3d e8f21e4a3dbec1f262e29063419e4648538a8bce
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 20:03:53 2015 -0800

    Fix merge madness

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

-- 
kio packaging