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

The following commit has been merged in the master branch:
commit a5e047bdb0b9bdd329ae0cd1f213ce6428b6870f
Merge: 807108d25e15f63f208b3246cdd586c71bffee48 a16e840b0f71ed5ddc6e80b0a24ea551f4fe4a83
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Sun Sep 30 19:48:16 2012 +0200

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	config/kcm_ktp_chat_messages.desktop
    	filters/emoticons/ktptextui_message_filter_emoticons.desktop
    	filters/formatting/ktptextui_message_filter_formatting.desktop
    	filters/images/ktptextui_message_filter_images.desktop
    	filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
    	lib/ktptxtui_message_filter.desktop
    	tests/message-processor-basic-tests.cpp
    	tests/message-processor-basic-tests.h

-- 
ktp-common-internals packaging