[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=8b4f1f5

The following commit has been merged in the master branch:
commit 8b4f1f56e24506be8e17ceec71a2bd3d5b99544e
Merge: f9cf1ff5eed5f9e2218f50695aebd9a71aee1155 c1a23f9fb9fbe337e6038ffdc246c75f54b349ff
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-contact-applet packaging