[SCM] kmediaplayer packaging branch, master, updated. debian/5.37.0-2-75-g4b1fbb2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kmediaplayer.git;a=commitdiff;h=51871c9

The following commit has been merged in the master branch:
commit 51871c9783a4b219723ed0fe7126fa27f277d0ac
Merge: 5f0642d663a87a2307c9c6dbe1c02e994ad137e9 f358990ddf71b293771a737f273d18c8a42657a0
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 20:44:37 2015 -0800

    Fix merge madness

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

-- 
kmediaplayer packaging