telepathy-mission-control: Merge branch 'storage-refactor-54870'

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Oct  4 16:03:30 2012 +0100

Merge branch 'storage-refactor-54870'

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54870
Reviewed-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

---