From kde-commits  Wed Jul 31 23:17:12 2013
From: David Edmundson <kde () davidedmundson ! co ! uk>
Date: Wed, 31 Jul 2013 23:17:12 +0000
To: kde-commits
Subject: [ktp-send-file] /: Merge branch 'kde-telepathy-0.6'
Message-Id: <E1V4fdo-0005DK-3G () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=137531263902018

Git commit d48a0a508686a215eed651ea0c3a8f26319e92a8 by David Edmundson.
Committed on 31/07/2013 at 23:17.
Pushed by davidedmundson into branch 'master'.

Merge branch 'kde-telepathy-0.6'


http://commits.kde.org/telepathy-send-file/d48a0a508686a215eed651ea0c3a8f26=
319e92a8