[SCM] ktp-approver packaging branch, master, updated. debian/15.12.1-1-299-g62cbbd7

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=02165e1

The following commit has been merged in the master branch:
commit 02165e1c90b6719157e760f58982c292a47cbf70
Merge: 8b24263a022190894e5b4297e6e119ded1ae932a 750bf8865bf19d277ba18998214bcda64a2455b7
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Jul 14 13:59:40 2013 +0000

    Merge branch 'kde-telepathy-0.6'

 src/filetransferchannelapprover.cpp | 3 ++-
 src/tubechannelapprover.cpp         | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

-- 
ktp-approver packaging