[SCM] kpackage packaging branch, master, updated. debian/5.37.0-2-83-gd1244e3

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 5f98a588f5bf8d68ffdee812a4ab2c48b64db4a6
Merge: 910b039d8d2170e49a695caa8eafc36f41d64b2e 1e23bb2ec4f3d468eba1afbe71a1c316e45e8a1e
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 20:26:29 2015 -0800

    Fix merge madness

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

-- 
kpackage packaging