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

The following commit has been merged in the master branch:
commit d185818726fba567bc266e29405b87cab8087c19
Merge: b859cdf34d4cb506b0fd58eefde962cdfb0e0d47 26936deac92f42b49bdf5e1337df0acb7bcf220f
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Aug 31 16:25:57 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

 KTp/message-url-filter.cpp | 59 ++++++++++------------------------------------
 1 file changed, 12 insertions(+), 47 deletions(-)

-- 
ktp-common-internals packaging