[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=1d88c48

The following commit has been merged in the master branch:
commit 1d88c481990939273f482c5c5263443b739ca05a
Merge: 841398147865a263fba6f31cd5d06d6528eff7b2 68a8f916e738a81ea18616d47492596181f08056
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Nov 25 11:48:16 2013 +0100

    Merge branch 'kpeople2'

 logviewer/entity-view.cpp               | 2 +-
 logviewer/person-entity-merge-model.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
ktp-text-ui packaging