[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=1d796de

The following commit has been merged in the master branch:
commit 1d796dee91a3538dfdd74ad1b14c83a0e5d72e74
Merge: 45c308e8e7835cb44fdf31384bb5759192adc4c4 cea5e8a43e5130f5acb8eab3c5a424c297b23598
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Apr 18 15:17:00 2013 +0200

    Merge branch 'kde-telepathy-0.6'

 CMakeLists.txt                                              |  2 +-
 .../contents/ui/ConversationDelegateButton.qml              | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

-- 
ktp-contact-applet packaging