[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=371feb5

The following commit has been merged in the master branch:
commit 371feb531ee282dec902459a43bac6fde6e0984d
Merge: 4c33bf98718a251d10166a0fe271beaeaeaefe3e 8d4f95498ecf41b36f17cb12b8363455ab939219
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Sun Apr 1 12:41:53 2012 +0300

    Merge branch 'kde-telepathy-0.3'
    
    Conflicts:
    	config/kcm_ktp_chat_appearance.desktop
    	config/kcm_ktp_chat_behavior.desktop

 config/kcm_ktp_chat_appearance.desktop             |   1 +
 config/kcm_ktp_chat_behavior.desktop               |   1 +
 .../Contents/Resources/Renkoo LICENSE.txt          | 173 +++++++++++++++++----
 3 files changed, 148 insertions(+), 27 deletions(-)

-- 
ktp-text-ui packaging