[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=43c48c4

The following commit has been merged in the master branch:
commit 43c48c4a2074679f283f82fa8558c8e34f9c9d59
Merge: 86ab14c93708f9e1d50240459f187c34489fc67a 570e41070c81c7727b563da04d3bf5b898393386
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sat Nov 10 12:07:28 2012 +0100

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	config/kcm_ktp_chat_appearance.desktop
    	config/kcm_ktp_chat_behavior.desktop
    	config/kcm_ktp_chat_messages.desktop
    	filters/emoticons/ktptextui_message_filter_emoticons.desktop
    	filters/formatting/ktptextui_message_filter_formatting.desktop
    	filters/images/ktptextui_message_filter_images.desktop
    	filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
    	lib/ktptxtui_message_filter.desktop
    	logviewer/ktp-log-viewer.desktop
    	plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop

-- 
ktp-contact-applet packaging