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

The following commit has been merged in the master branch:
commit b51c811fcc21733e935e1f6b85771b9ce9de7272
Merge: ff7d0d2a6f6ff7cb186f81c2f74ef170030e95f1 b55e9a050ac5e8a3e196cd152fff906379fd7b2f
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Dec 15 18:38:06 2012 +0000

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

-- 
ktp-contact-runner packaging