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

The following commit has been merged in the master branch:
commit fc525745ae0b590a6852cf964aa40fb5f44b1f0c
Merge: dbb6f4cf87fffb221ac906151d412d946179d932 3c63fe385f597e8d14bb5b31155cd1b3b1c3b667
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Jan 17 10:57:56 2013 +0100

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

 global-presence-chooser.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

-- 
ktp-contact-list packaging