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

The following commit has been merged in the master branch:
commit c97d1d545fad58e847dfd4f469f686008d9c0bb7
Merge: 5b656c264bedb81ae5c59106fb2ac2eca443e653 720de9794d015584874e992eb20fa5573cb5f291
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Dec 12 14:24:00 2012 -0800

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

-- 
ktp-contact-applet packaging