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

The following commit has been merged in the master branch:
commit bfc2f06897630253330b9f9d024402e6de5d55ab
Merge: 70c70646b3025c2106488f9fbacaa78ac2580733 4413383453574c060f7192cbcb0548e410eca225
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Feb 24 17:52:09 2012 +0100

    Merge branch 'kde-telepathy-0.3'
    
    Conflicts:
    	contact-list-widget.cpp

 ktelepathy.notifyrc     | 36 ++++++++++++++++++++++++++++++++++++
 ktp-contactlist.desktop |  3 +++
 2 files changed, 39 insertions(+)

-- 
ktp-contact-list packaging