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

[Simon McVittie]

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

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

Merge tag 'telepathy-glib-0.21.0' into next

telepathy-glib 0.21.0

Conflicts:
	configure.ac
	telepathy-glib/connection.c
	telepathy-glib/util.c
	telepathy-glib/util.h
	tests/dbus/contacts.c

---