[SCM] ktp-send-file packaging branch, master, updated. debian/15.12.1-2-216-g8f07cdf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=9a6bd9b

The following commit has been merged in the master branch:
commit 9a6bd9b99b7db972773887de9b4884d54570289a
Merge: ac7bf1c29988b9fd97c1587db28783335af08da8 caadc9916eb3c6582ab61e6565c03c27472d0d54
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Nov 16 09:28:07 2012 +0100

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	ktp-send-file.desktop

 main.cpp | 2 ++
 1 file changed, 2 insertions(+)

-- 
ktp-send-file packaging