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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Nov  4 13:25:18 2013 +0000

Merge branch 'master' into next

Conflicts:
	tools/glib-client-gen.py

---