[SCM] kemoticons packaging branch, master, updated. debian/5.37.0-2-86-gcaf9daf

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit ffe99e6e76aa64c97883422bc0c0ed4e739c2d0d
Merge: 9278822d928d97cf48fd863696a3534d9cdf6078 ef307ec2675cda569b1505c54f3b222e7f0080dd
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 19:46:06 2015 -0800

    Fix merge madness

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

-- 
kemoticons packaging