[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=72f403a

The following commit has been merged in the master branch:
commit 72f403aa585652162b7a94d38fa363be8f721032
Merge: 48f4e33fa8c5ba1a9ffc7f1f5da7e9205930d337 2260944e24158f62ee8331dddc61740ae7d201a5
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Nov 24 00:37:45 2012 +0900

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

 abstract-contact-delegate.cpp | 2 +-
 contact-delegate-compact.cpp  | 4 ++--
 contact-delegate.cpp          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

-- 
ktp-contact-list packaging