[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=3f250df

The following commit has been merged in the master branch:
commit 3f250dffe7b7cddb6396047847b2c997b4dc8741
Merge: d7e507747f04c0c9a3851615af2d879143aa62bf 04a4b6a25f63fe9facc3600f911d325a65254f62
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Sun Jun 17 16:30:47 2012 +0300

    Merge branch 'kde-telepathy-0.4'
    
    Conflicts:
    	logviewer/ktp-log-viewer.desktop

 chat/org.kde.ktp-chat/metadata.desktop | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
ktp-contact-applet packaging