[SCM] kparts packaging branch, master, updated. debian/5.37.0-2-83-g5a53f7e

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 5bab6b307475f7fd7a9498056bf7001d7c3291d5
Merge: 6f2784b3c2d9844d2324799dc1b5cc5c4b58ff71 b8e68bdea41e9ee7871d9c802981c4ce7302a326
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 20:30:01 2015 -0800

    Fix merge madness

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

-- 
kparts packaging