telepathy-mission-control: Merge branch 'altered-one-54780'

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Feb 13 14:36:42 2013 +0000

Merge branch 'altered-one-54780'

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54780
Reviewed-by: Will Thompson <will.thompson at collabora.co.uk>
[deleted a stray line from a comment as per wjt's review -smcv]
Conflicts:
	src/mcd-account.c

---