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

The following commit has been merged in the master branch:
commit a34b995ac8dad5cb5aa9b57639179be8536b8f3d
Merge: b89d730f05662083e16aae5ae516af1060f374b5 add376384930a94627c9a34bfb6afe5107c75539
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Fri Aug 24 13:29:22 2012 +0300

    Merge branch 'kde-telepathy-0.4'
    
    Conflicts:
    	src/ktp_approver.desktop
    	src/ktpapprovermodule.cpp

-- 
ktp-approver packaging