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