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