From kde-commits  Wed Jul 31 23:16:44 2013
From: David Edmundson <kde () davidedmundson ! co ! uk>
Date: Wed, 31 Jul 2013 23:16:44 +0000
To: kde-commits
Subject: [ktp-kded-module] /: Merge branch 'kde-telepathy-0.6'
Message-Id: <E1V4fdM-00057s-Ue () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=137531261202011

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

Merge branch 'kde-telepathy-0.6'


http://commits.kde.org/telepathy-kded-module/ba875260b7ea69e1f20ceb8581e71d=
3f7e25e597