[next] telepathy-glib: Merge remote-tracking branch 'origin/master' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Apr 26 18:02:26 2012 +0100

Merge remote-tracking branch 'origin/master' into next

---