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

The following commit has been merged in the master branch:
commit ba863e4ff8de9df08afca8a99f49be28174f542c
Merge: e0cea5649ab9831cb30388dec9ae654b57138c1a 273d47007de514cfc4a910f30bdd5216359b3591
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Oct 12 10:56:41 2012 +0200

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	config/kcm_ktp_chat_messages.desktop
    	filters/formatting/ktptextui_message_filter_formatting.desktop
    	filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
    	lib/ktptxtui_message_filter.desktop

-- 
ktp-contact-applet packaging