[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=6c06c67

The following commit has been merged in the master branch:
commit 6c06c671e228fc081dcd85ff20eb44881d4dbf62
Merge: f36f74c5f2f80c6312f3d85ec6acdfb51d9774a7 8c06def2fd74677419c3109c362ad334bce76c1e
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Feb 17 21:45:23 2014 +0100

    Merge branch 'kde-telepathy-0.7'
    
    Conflicts:
    	CMakeLists.txt

 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
ktp-auth-handler packaging