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

The following commit has been merged in the master branch:
commit c0333c7ac086ab03539c89326254109000a7ad0e
Merge: 9eb831ec114bfc6806a6ab3ae52e08e456d52bbf e7506f34085f413299bad4f9d8a25aac5e914c9b
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Feb 14 14:34:22 2013 +0000

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

 src/ktpapprovermodule.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
ktp-approver packaging