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

The following commit has been merged in the master branch:
commit a38417aaa5379a0f03598d5c7a308a53ce145f68
Merge: 71c322f91616c03c8bfb22cdee947d3095280ab2 88fe00a3071ffaa9a1180f4c0922020b77f733e3
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Tue Jul 24 21:21:14 2012 +0300

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

 src/ktp_approver.desktop  | 2 +-
 src/ktpapprovermodule.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
ktp-approver packaging