From kde-commits  Wed Jul 31 23:00:19 2013
From: David Edmundson <kde () davidedmundson ! co ! uk>
Date: Wed, 31 Jul 2013 23:00:19 +0000
To: kde-commits
Subject: [ktp-approver] /: Merge branch 'kde-telepathy-0.6'
Message-Id: <E1V4fNT-0007QM-2x () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=137531162901704

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

Merge branch 'kde-telepathy-0.6'


http://commits.kde.org/telepathy-approver/e49bd19f84334d967be6a297477ffb3ea=
99fbdce