[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=2533ff6

The following commit has been merged in the master branch:
commit 2533ff6399a8a3252a30b7c80303a017997dc1b0
Merge: dfbf9b79fa2e8364972889e40ee3de49d9e71b32 405e1e1731e952c930e01ebb73dc624d21fea4b8
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Oct 26 02:13:38 2013 +0200

    Merge branch 'kde-telepathy-0.7'
    
    Conflicts:
    	KTp/Logger/ktp_logger_plugin.desktop
    	KTp/Logger/plugins/tplogger/ktploggerplugin_tplogger.desktop.cmake
    	kpeople/nepomuk-feeder/nepomuktelepathyservice.desktop

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

-- 
ktp-common-internals packaging