[next] telepathy-glib: Merge remote-tracking branch 'xclaesse/next-contact' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu May  3 13:45:42 2012 +0100

Merge remote-tracking branch 'xclaesse/next-contact' into next

Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>

---