[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=9eef30b

The following commit has been merged in the master branch:
commit 9eef30b9aa98c4b5df2a11d43cf95f9107134b3f
Merge: 9b770a052db1d43d00ca19ee92eb08391147b586 32cf915d69366a59924d9ff4b4a0076d19befe3b
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Sun Apr 1 12:29:25 2012 +0300

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

 src/ktp_approver.desktop | 1 +
 1 file changed, 1 insertion(+)

-- 
ktp-approver packaging