telepathy-mission-control: Merge branch ' one-channel-should-be-enough-for-anyone'

Tue Jul 31 03:41:21 PDT 2012

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Jul 30 15:41:00 2012 +0100

Merge branch 'one-channel-should-be-enough-for-anyone'

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

---