telepathy-mission-control: Merge branch 'typed-settings-54872'

[Simon McVittie]

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

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

Merge branch 'typed-settings-54872'

Reviewed-by: Will Thompson <will.thompson at collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54872
[amended to add GLib 2.32 dependency -smcv]
Conflicts:
	src/mcd-account.c

---