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

The following commit has been merged in the master branch:
commit 387796928eb011a501569a82d34c7f6915f6d4c0
Merge: 548ab3b06d8536dc089798dd96c8c4e76193dd9e d93f6c0effbea87d3a62a6d79d990eded8b1fc05
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Feb 17 20:52:41 2014 +0100

    Merge branch 'kde-telepathy-0.7'
    
    Conflicts:
    	ktp-approver.desktop

 CMakeLists.txt              | 2 +-
 src/tubechannelapprover.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
ktp-approver packaging