[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=109efec

The following commit has been merged in the master branch:
commit 109efec5a79ecb3bde1d60351bbc6bfcad2b8f6c
Merge: 95a25be674fd4b8a0ec014f2f59febb47ecf051f 2eb3e2f3081119d312709fb09308a3efb1c24398
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Fri Dec 28 01:28:31 2012 +0100

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	filters/formatting/ktptextui_message_filter_formatting.desktop
    	logviewer/log-viewer.cpp

-- 
ktp-contact-applet packaging