[SCM] solid packaging branch, master, updated. debian/5.37.0-2-85-gc9bde65

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 6bb0a4aecd150d72ef75c7951295f0e5b8fe4d85
Merge: 09fc4841fc1ebafa2572d87fa08545aaaa9bc87b f815f84d53318de3f424c7de3567f9e4f1b6a2a6
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 21:14:02 2015 -0800

    Fix merge madness

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

-- 
solid packaging