[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=622c7c9

The following commit has been merged in the master branch:
commit 622c7c9a6f966efdf6abfe59f3c1fcda0d098534
Merge: b29f0daf9b94b20acd44e112ac366eef3d9476b4 5ad4ada6e3d223741db12758f48c9878e7ef0ea2
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Sun Apr 1 12:38:52 2012 +0300

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

 config/kcm_ktp_integration_module.desktop | 1 +
 kded_ktp_integration_module.desktop       | 2 ++
 2 files changed, 3 insertions(+)

-- 
ktp-kded-integration-module packaging