[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=ca06722

The following commit has been merged in the master branch:
commit ca06722216dc5756f295d9d88e6c3a61ee7f3454
Merge: d9f3d7d9a2c23fd9112bfa8f3a821f0f8c08288a d37661de3e8a5fc66cd60514e3eb1774dc594809
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Jul 31 23:51:05 2013 +0100

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

-- 
ktp-common-internals packaging