[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.08.2-1-7-ga17d417

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-kded-integration-module.git;a=commitdiff;h=e223cc5

The following commit has been merged in the master branch:
commit e223cc56d334550ffb1d386c122020148e864708
Merge: 5fcdb531ffec8020b7b7b27c41e094a8eb891253 5ba5853715f895a8b57a212f0b6f4a377f6d2fe4
Author: Diane Trout <diane at ghic.org>
Date:   Wed Dec 2 23:00:44 2015 -0800

    Merge branch 'upstream'

 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
ktp-kded-integration-module packaging