[SCM] kcodecs packaging branch, master, updated. debian/5.37.0-2-93-gd165600

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcodecs.git;a=commitdiff;h=4937bad

The following commit has been merged in the master branch:
commit 4937bad3309b533bdda75886afdbc472e7b8b319
Merge: 6368ff84db98df94e4df8950ed52028103511147 9ad86cf8337e1d9f6576260b5fba77e04263d4a6
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 19:12:22 2015 -0800

    Fix merge madness

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

-- 
kcodecs packaging