7231aaaf2469affebd1a884a6a3668788d6fe6d7	not-for-merge	branch 'master' of /home/jonny/src/telepathy-extras
