[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=50f13cc

The following commit has been merged in the master branch:
commit 50f13cca63f4434b9bebbd050558d6cc9bc4a22e
Merge: 7de76183f38a9fcca6acb2b4e3f0602cfdecda9a 6cbefb04441bab0d25dde78d95a2adee4d163fd5
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Apr 1 18:07:27 2013 +0100

    Merge branch 'kde-telepathy-0.6'
    
    Conflicts:
    	data/ktelepathy.notifyrc

 KTp/debug.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
ktp-common-internals packaging