telepathy-mission-control: Merge branch 'mock-account-store-54873'

[Simon McVittie]

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

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

Merge branch 'mock-account-store-54873'

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54873
Reviewed-by: Will Thompson <will.thompson at collabora.co.uk>
Conflicts:
	tests/twisted/account-manager/avatar.py

---