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

The following commit has been merged in the master branch:
commit b47b47b68f45e98569000e9b7423794d60f3692a
Merge: cd58dba116e5d005cc061d1b23ea857fae9e719e 4b04b264b1085d91a28b9a43ff2e3d32db1eca57
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Sun Apr 1 12:37:25 2012 +0300

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

 ktelepathy.notifyrc     | 32 ++++++++++++++++++++++++++++++++
 ktp-contactlist.desktop |  2 ++
 2 files changed, 34 insertions(+)

-- 
ktp-contact-list packaging