[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=5643d20

The following commit has been merged in the master branch:
commit 5643d20f996ade5ff81ca6e38a368e49c7a91f0e
Merge: 0dd886aa09e6107faba7eed95708f08f3debdfb5 d0e7a2e42cec11e9d0eecf4ae6923660fa50400c
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Dec 12 12:47:42 2012 -0800

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

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

-- 
ktp-approver packaging