[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/0.4.0-1-20-g15c09c4

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-filetransfer-handler.git;a=commitdiff;h=f134e70

The following commit has been merged in the master branch:
commit f134e70d8ed098648a3624b5c62a7f71ef3ab73d
Merge: 7b9862f4f1bf0d20ef89b215827b9b31f5d7da89 ef00cdf598f1edbed1e502749a1349ca91fcb60f
Author: Diane Trout <diane at caltech.edu>
Date:   Fri May 17 14:12:33 2013 -0700

    Merge tag 'upstream/0.6.1'
    
    Upstream version 0.6.1

 CMakeLists.txt                    |    2 +-
 po/nb/ktp-filetransfer-handler.po |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
ktp-filetransfer-handler packaging