telepathy-mission-control: Merge branch 'aliasing-avatars'

[Simon McVittie]

Module: telepathy-mission-control
Branch: master
Commit: 2fe37c082b5db56513598beb638b331ccfff9b0b
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=2fe37c082b5db56513598beb638b331ccfff9b0b

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Oct  9 16:53:19 2012 +0100

Merge branch 'aliasing-avatars'

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=55668
Reviewed-by: Xavier Claessens <xavier.claessens at collabora.co.uk>

---