[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=e4bc044

The following commit has been merged in the master branch:
commit e4bc044418a1569221daf4c4b94f6bec2365d577
Merge: fffcc2e011b6380a5478a9833d4dcd331b7906e6 a917b3b297881b4af9f7738df03e08a7a1bcd2cd
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Feb 17 21:33:43 2014 +0100

    Merge branch 'kde-telepathy-0.7'
    
    Conflicts:
    	CMakeLists.txt

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

-- 
ktp-kded-integration-module packaging