From kde-commits  Wed Jul 31 22:58:11 2013
From: David Edmundson <kde () davidedmundson ! co ! uk>
Date: Wed, 31 Jul 2013 22:58:11 +0000
To: kde-commits
Subject: [ktp-accounts-kcm] /: Merge branch 'kde-telepathy-0.6'
Message-Id: <E1V4fLP-0005td-Jp () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=137531150101663

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

Merge branch 'kde-telepathy-0.6'

Conflicts:
	CMakeLists.txt


http://commits.kde.org/telepathy-accounts-kcm/9eaf7cb5685a0dbab1c1f6a64ef9f=
35b8dc29467