[SCM] kidletime packaging branch, master, updated. debian/5.37.0-2-86-g062b4e5

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 4dd9bb5c4fa6b7dc6ab2e1992117be29dd4588ac
Merge: 4cf3cb9a89d701de090ff3ed7811e1649b6c75ec 0a94e74e6ee56de50cc730465c7b0e3d807e7af6
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 20:02:41 2015 -0800

    Fix merge madness

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

-- 
kidletime packaging