[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=2a8e7fe

The following commit has been merged in the master branch:
commit 2a8e7fe009902afe588856ea7cdd6f97053a0257
Merge: 34108681c3dcbc7113138b327ac0b969d6ea4749 5382721f2b3c62479a9dea1709f9177a0cd24ed2
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Fri Aug 24 13:45:11 2012 +0300

    Merge branch 'kde-telepathy-0.4'
    
    Conflicts:
    	app/main.cpp
    	config/kcm_ktp_chat_appearance.desktop
    	config/kcm_ktp_chat_behavior.desktop
    	logviewer/ktp-log-viewer.desktop
    	logviewer/main.cpp
    	plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop

-- 
ktp-text-ui packaging