[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=6f8dad3

The following commit has been merged in the master branch:
commit 6f8dad33109782c008fb01e709d78421d13fef8d
Merge: 83e56ecdb93f3749e791c440a381ea620fc926e9 d5362f7613458b0afd2a18de78d228534e2de915
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Feb 14 18:08:11 2013 +0000

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	ktp-contactlist.desktop

 main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
ktp-contact-list packaging