[SCM] sonnet packaging branch, master, updated. debian/5.37.0-2-100-g6ea1571

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 65a4fbc939c75ed47836ffaed8cf6f4e799b8a11
Merge: 5c00477985605f077265dfa232f09679764ca52b b6c4e1b8024d81811b1e531354eafa19d4856686
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 21:20:18 2015 -0800

    Fix merge madness

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

-- 
sonnet packaging