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