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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Sep 27 14:22:10 2013 +0100

Merge branch 'master' into next

Conflicts:
	telepathy-glib/account-manager.c
	telepathy-glib/account-manager.h
	telepathy-glib/account.c
	telepathy-glib/account.h
	tests/dbus/account-manager.c

---