[next] telepathy-glib: Merge branch 'next-tap' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Mar 25 10:21:31 2014 +0000

Merge branch 'next-tap' into next

Reviewed-by: Xaveir Claessens

---