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

The following commit has been merged in the master branch:
commit cbfc6f9a15c44cae33ac2f0e4e6f6156d2fcb39a
Merge: 75bd2aec4125f29de2d40cd2967a5fc865ab6a40 6a3235def3a300c461de6c3bf7d7d1bae29eab3f
Author: Aleix Pol <aleixpol at kde.org>
Date:   Fri Apr 5 19:39:11 2013 +0200

    Merge branch 'kde-telepathy-0.6'

 chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml | 6 +++---
 chat/org.kde.ktp-chat/contents/ui/main.qml                 | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

-- 
ktp-contact-applet packaging