[next] telepathy-glib: Merge branch 'base-channel-disappear'

[Jonny Lamb]

Module: telepathy-glib
Branch: next
Commit: 1a4d0f347efae2d4d7e8a8523ea8280086867d34
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=1a4d0f347efae2d4d7e8a8523ea8280086867d34

Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Mon Aug 27 17:55:54 2012 +0100

Merge branch 'base-channel-disappear'

---