[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=63b85e5

The following commit has been merged in the master branch:
commit 63b85e5a83daa789a04afd3708a9da88f0705b83
Merge: d12ffbd79d36d9e40753c6dfc80ab20bb12a018c fbdebd087dc72b514b2423abfddf672a9052469c
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Jan 30 09:51:10 2013 +0100

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	lib/chat-widget.cpp
    	lib/ktptxtui_message_filter.desktop
    	plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop

-- 
ktp-text-ui packaging