[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=4308acd

The following commit has been merged in the master branch:
commit 4308acd7a766c70e4e28bbfc0c55e799bdd7cccc
Merge: cb62153277f8d85c6fb585f684d9ae63d63f7ee5 16a14767f4882da7c436ad1dd7db6bb12ce7172d
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Sat Dec 10 15:42:20 2011 +0100

    Merge branch 'port-to-0.9'
    
    BUG:288545

 CMakeLists.txt                       |  2 +-
 autoaway.cpp                         |  4 ++--
 autoaway.h                           |  4 ++--
 cmake/modules/FindTelepathyQt4.cmake | 43 ------------------------------------
 contact-request-handler.cpp          | 10 ++++-----
 contact-request-handler.h            |  4 ++--
 error-handler.h                      |  2 +-
 telepathy-kded-module-plugin.h       |  4 ++--
 telepathy-module.cpp                 |  8 +++----
 telepathy-module.h                   |  2 +-
 telepathy-mpris.cpp                  |  2 +-
 telepathy-mpris.h                    |  4 ++--
 12 files changed, 23 insertions(+), 66 deletions(-)

-- 
ktp-kded-integration-module packaging