[SCM] kross packaging branch, kubuntu_wily_backports, updated. ubuntu/5.15.0-0ubuntu2-25-gf96aacb

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit a4e5b52b23904ee2548b4fc0047e99562eb3974d
Merge: 8996efe3003b4af8e6fb4388106711006454a558 b4f397e94a6438d59a16e43c2509f76f92eef986
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 20:40:47 2015 -0800

    Fix merge madness

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

-- 
kross packaging