[SCM] kdbusaddons packaging branch, master, updated. debian/5.37.0-2-83-g6cdabf1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 4a6548f18f3e41434283954fcb2240371f38675d
Merge: 55d5145ad8ca6a1572771eb5b74d77c6c91782c2 809b1a5d76206805c7358a0510349ec0fad037cf
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 19:24:17 2015 -0800

    Fix merge madness

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

-- 
kdbusaddons packaging