[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=3ea0430

The following commit has been merged in the master branch:
commit 3ea04301599e76fa8c91b3c70a928c6a23fa338a
Merge: 69c307cfded70fd820119b328ab5650e38c22c23 b03f8da1eb88d2fbeac5f936cf74a7f72612011d
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Dec 11 17:09:12 2012 -0800

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

 contact-request-handler.cpp |  2 +-
 telepathy-mpris.cpp         | 23 +++++++++++++++++++++--
 telepathy-mpris.h           |  3 +++
 3 files changed, 25 insertions(+), 3 deletions(-)

-- 
ktp-kded-integration-module packaging