[SCM] kfilemetadata packaging branch, master, updated. debian/5.37.0-2-91-g4158674

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a35856b9b27ead167248075df510f02ff1138c65
Merge: e102627f1ab866996185a0d35440592acaf09630 de0c5b694bb1af124c7374f21e674e02d3edf39f
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 19:48:22 2015 -0800

    Fix merge madness

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

-- 
kfilemetadata packaging