[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=4a46a02

The following commit has been merged in the master branch:
commit 4a46a0210abfb8b0dffcd483a870964e1c34414c
Merge: 2dc2d46800bb921c6f6062c3c19079dfed7775d1 ff567adef28b035de3ccdce7d630e37ebe21e00c
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Fri Aug 24 13:38:20 2012 +0300

    Merge branch 'kde-telepathy-0.4'
    
    Conflicts:
    	ktp-contactlist.desktop
    	main.cpp

-- 
ktp-contact-list packaging