[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=c69a3c9

The following commit has been merged in the master branch:
commit c69a3c94b94ae799b8562536c5b8b01fd0d05204
Merge: df6c7c444031acc85ebcdeed793930e11dc604a6 9553c2d1178a90b8eeb4580824d3d974b7bb9daa
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Jun 13 20:43:55 2012 +0200

    Merge branch 'kde-telepathy-0.4'

 global-presence-chooser.cpp | 25 +++++++++++++++++++++++--
 global-presence-chooser.h   |  2 ++
 ktp-contactlist.desktop     | 24 ++----------------------
 3 files changed, 27 insertions(+), 24 deletions(-)

-- 
ktp-contact-list packaging