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

The following commit has been merged in the master branch:
commit f3bb0b8bea8943987e508e00c57f3921b3589240
Merge: fa41d4f20fc84039fbaab75bdab5386c7523a11c 78a85289ce7c7245459e9f1898bef01d8ade054b
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Tue Jul 31 18:38:58 2012 +0300

    Merge branch 'kde-telepathy-0.4'
    
    Conflicts:
    	plasma_applet_ktp_presence.desktop

 presence/plasma-applet-ktp-presence.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
ktp-contact-applet packaging