[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=787935b

The following commit has been merged in the master branch:
commit 787935b68661d178589ac5371b3c3c3905529705
Merge: aa3c588c7709a88ca337c872552cd16c2bd17037 1039024e3f347bba78a8f28eebc58f2e856786ec
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Sat Nov 26 01:32:25 2011 +0100

    Merge branch 'add-contact'
    
    REVIEW:103203
    BUG:285410
    
    Signed-off-by: Dario Freddi <dario.freddi at collabora.com>

 CMakeLists.txt              |   1 +
 contact-request-handler.cpp | 420 ++++++++++++++++++++++++++++++++++++++++++++
 contact-request-handler.h   |  64 +++++++
 telepathy-module.cpp        |  12 +-
 telepathy-module.h          |   4 +-
 5 files changed, 498 insertions(+), 3 deletions(-)

-- 
ktp-kded-integration-module packaging