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

The following commit has been merged in the master branch:
commit eae56a0919c670001beedd5ff8ddb2ed66308a05
Merge: feb0386bff5fa848fda33a948153f5ee51727434 a8fe2153a29e9d32388c48f8263a0160708c82b7
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Mar 16 15:52:21 2015 +0100

    Merge branch 'Applications/15.04'
    
    Conflicts:
    	person/org.kde.person/metadata.desktop.cmake

 chat/Messages.sh                                         | 2 ++
 contactlist/Messages.sh                                  | 2 ++
 contactlist/org.kde.ktp-contactlist/contents/ui/main.qml | 4 ++--
 person/Messages.sh                                       | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

-- 
ktp-contact-applet packaging