[SCM] kguiaddons packaging branch, master, updated. debian/5.37.0-2-83-gee95721

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit affc95ac43c3fce624a5df3cf1b15084d127a9e8
Merge: 93cdd536dee288c80584ffc1e4941ea311517913 726bafe0bf4d6deab94b54ad68a321e5f5505934
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 19:52:41 2015 -0800

    Fix merge madness

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

-- 
kguiaddons packaging