From kde-commits  Wed Jul 31 22:51:14 2013
From: David Edmundson <kde () davidedmundson ! co ! uk>
Date: Wed, 31 Jul 2013 22:51:14 +0000
To: kde-commits
Subject: [ktp-common-internals] /: Merge branch 'kde-telepathy-0.6'
Message-Id: <E1V4fEg-0005km-Ol () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=137531108201576

Git commit ca06722216dc5756f295d9d88e6c3a61ee7f3454 by David Edmundson.
Committed on 31/07/2013 at 22:51.
Pushed by davidedmundson into branch 'master'.

Merge branch 'kde-telepathy-0.6'

Conflicts:
	CMakeLists.txt


http://commits.kde.org/telepathy-common-internals/ca06722216dc5756f295d9d88=
e6c3a61ee7f3454