From kde-commits  Wed Jul 31 23:14:33 2013
From: David Edmundson <kde () davidedmundson ! co ! uk>
Date: Wed, 31 Jul 2013 23:14:33 +0000
To: kde-commits
Subject: [ktp-filetransfer-handler] /: Merge branch 'kde-telepathy-0.6'
Message-Id: <E1V4fbF-0004ru-P1 () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=137531248201958

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