[SCM] kwindowsystem packaging branch, kubuntu_wily_backports, updated. debian/5.16.0-1-47-gc1e6f68

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 0081ebae35c853ad3d77feebfcb32d3730ead01d
Merge: db73e211d27d13e3c5e80a8533267a1ddf08ba3b f3a8fdd3844269e086552d19bbea530b712b5fc8
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 21:09:17 2015 -0800

    Fix merge madness

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

-- 
kwindowsystem packaging