[SCM] kpty packaging branch, master, updated. debian/5.37.0-2-96-g6d8962f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 40ff4ada6622b5c16d31a4a9dff093c7eecb8898
Merge: edc46fc9baf3078eae3cf3f8aa47eae47db55617 638e51c89165da0a4873abe512e176a5eb467924
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 20:38:41 2015 -0800

    Fix merge madness

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

-- 
kpty packaging