telepathy-mission-control: Merge branch 'present-delegate-broken'

[Jonny Lamb]

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

Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Mon Jul  9 18:10:39 2012 +0100

Merge branch 'present-delegate-broken'

---