[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=8a8d1a2

The following commit has been merged in the master branch:
commit 8a8d1a2d1bded0967272b9ed79387fea1cf2f7ca
Merge: cc190d72744a5e9c121575fe921fc6e81ce35170 4133c17f7b48f55cafe81ca3b00baa9e86416c98
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Jan 4 19:08:53 2013 +0100

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

 KTp/Models/groups-model.cpp | 2 ++
 1 file changed, 2 insertions(+)

-- 
ktp-common-internals packaging