[SCM] kplotting packaging branch, master, updated. debian/5.37.0-2-77-g14f4dcf

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 80bc89e1bb06013e2c8bd97a0f9dc32ada81f2bf
Merge: 2c8f6c1c2f182f16ecb91b039f961d87e495e939 cf67356aaa29c82360fdd70d7cfacb195bc706c8
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 20:32:13 2015 -0800

    Fix merge madness

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

-- 
kplotting packaging