[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=b808a95

The following commit has been merged in the master branch:
commit b808a952c84560468d711a592ad1cf25faa1f816
Merge: 129c1d33057dd1e040d08b82095e62734ccdb6b1 73e3307a06eb0c8dadd97481cf31584092154bea
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Jun 1 13:39:04 2013 +0100

    Merge branch 'kde-telepathy-0.6'

 error-handler.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

-- 
ktp-kded-integration-module packaging