[SCM] kjs packaging branch, master, updated. debian/5.37.0-2-88-g3d86386

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit f44dca49bbd05f6f74c4db75fb0b4b94b202386b
Merge: 505bc0b51e9ca7705f50ba4166b51c8258d127c6 89eb148adac8467f4b6a84d35b9ac390d032dfb7
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 20:06:24 2015 -0800

    Fix merge madness

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

-- 
kjs packaging