Merge proposals dependent on lp://staging/~zeitgeist-dataproviders/zeitgeist-datasources/telepathy-new

1. telepathy-new
2. Dependent merge proposals