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

The following commit has been merged in the master branch:
commit ec09c8697fb07b72fc35eb8a52938acd88691d2b
Merge: d209d274c0f6fb50ea076e80c4eb42242c3cfc93 2073550ee2aa1be61a21ba8aa90603737dba8936
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Oct 31 19:58:01 2012 +0100

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

-- 
ktp-contact-applet packaging