[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=79c7012

The following commit has been merged in the master branch:
commit 79c701275ad518c834bf7e52361706bce4249f31
Merge: 748b3d4bfb935ffeb2600c3fb6206c39618969db 433825a4beaeabf93870f34d437caa0ec12472be
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Feb 14 18:04:12 2013 +0000

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	contact/plasma-applet-ktp-contact.desktop
    	contactlist/org.kde.ktp-contactlist/metadata.desktop

-- 
ktp-contact-applet packaging