[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=4343fb4

The following commit has been merged in the master branch:
commit 4343fb4767f3493852fc374c193e7fac7f51554c
Merge: ffe91728dfb73af5331f32f63720455b333448da 407445c5fb1b4a1584c6b7f149cb7ae1a6f7cae8
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Feb 14 19:26:39 2013 +0000

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	config/kcm_ktp_integration_module.desktop
    	kded_ktp_integration_module.desktop

-- 
ktp-kded-integration-module packaging