[SCM] kbookmarks packaging branch, master, updated. debian/5.37.0-2-88-gcf69a75

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7029cf735c76972aeaac5f4e43f96ce43b2e31a6
Merge: 813be4397758b406fc1696f2fb031f9e521a7cb2 3fb3d207b8289f829064c755b5184e50fb3fd471
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 19:09:49 2015 -0800

    Fix merge madness

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

-- 
kbookmarks packaging