[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=9a24cbc

The following commit has been merged in the master branch:
commit 9a24cbc3a12e4794b6aeb5e9fd2bd1cb0317653c
Merge: 43c48c4a2074679f283f82fa8558c8e34f9c9d59 f62f8285fc170646b71b5c29dad096fbc0593e11
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Dec 15 17:34:15 2012 +0000

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	CMakeLists.txt

 chat/org.kde.ktp-chat/metadata.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
ktp-contact-applet packaging