[SCM] ki18n packaging branch, master, updated. debian/5.37.0-2-84-g4be052e

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 39b50d43955ddf9deb172681dce734239f0a2cf5
Merge: a37e7d15a2155e95d8cc9b92418436bc328c3f85 c39924a4d1c13cdb3b52aba0ee7abc1d425da608
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 19:58:49 2015 -0800

    Fix merge madness

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

-- 
ki18n packaging