[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=47423f0

The following commit has been merged in the master branch:
commit 47423f033f7eb665a6359e19357cee7e28c47921
Merge: 07afbc82068c36c38584a67e6ab25a7cc11b546c 1f3fcc62ef509c5bbd39a3c9ed5e837addd13673
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sat Apr 28 02:42:22 2012 +0200

    Merge branch 'kde-telepathy-0.3'
    
    Conflicts:
    	ktelepathy.notifyrc
    	ktp-contactlist.desktop
    	main-widget.cpp

-- 
ktp-contact-list packaging