Git commit 265cf27e76e13ae4ecabdf0cb391e17632eeffb3 by David Edmundson. Committed on 31/07/2013 at 23:14. Pushed by davidedmundson into branch 'master'. Merge branch 'kde-telepathy-0.6' http://commits.kde.org/telepathy-filetransfer-handler/265cf27e76e13ae4ecabd= f0cb391e17632eeffb3