[SCM] ktp-contact-runner packaging branch, master, updated. debian/15.12.1-2-244-g38a1f58

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-runner.git;a=commitdiff;h=24ac930

The following commit has been merged in the master branch:
commit 24ac930f9661737112e60ff72782832353acb021
Merge: 6a29e5c789236697c1efc88be88754b029763480 9e211cbfc9615815963c763a9b8358541fbdedaa
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Feb 17 21:27:40 2014 +0100

    Merge branch 'kde-telepathy-0.7'
    
    Conflicts:
    	plasma-runner-ktp-contact.desktop.cmake

 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
ktp-contact-runner packaging