[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=2e56f52

The following commit has been merged in the master branch:
commit 2e56f52a33b9ac883e6ab13116ef678557b33ffd
Merge: f53b27104724687861ebb35213356799ac24b62d c92dde59b42b16dbe4f8c1004233d1a970f9498e
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Fri Nov 22 12:21:49 2013 +0100

    Merge branch 'kde-telepathy-0.7'
    
    Conflicts:
    	filters/latex/kcm_ktptextui_message_filter_latex.desktop

 logviewer/message-view.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
ktp-text-ui packaging