[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=2ed4dab

The following commit has been merged in the master branch:
commit 2ed4dabee6cd0917f6812005f1b076ebff8fbf12
Merge: 6dc5a3a8b0597fccca41a1a1354c036544dbd164 781e37e30eeb2b6cc9d1de9f5e1a5b5c1b2191fb
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed May 29 19:46:07 2013 +0100

    Merge branch 'kde-telepathy-0.6'

 lib/channel-contact-model.cpp | 10 ++++++----
 lib/chat-widget.cpp           |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

-- 
ktp-text-ui packaging