[next] telepathy-glib: Merge tag 'telepathy-glib-0.21.1' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 12 16:58:21 2013 +0100

Merge tag 'telepathy-glib-0.21.1' into next

telepathy-glib-0.21.1

Conflicts:
	configure.ac
	telepathy-glib/message.c

---