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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu May  3 13:43:45 2012 +0100

Merge branch 'master' into next

Conflicts:
	configure.ac
	telepathy-glib/account-channel-request.h
	telepathy-glib/account-manager.h
	telepathy-glib/account.h
	telepathy-glib/automatic-client-factory.h
	telepathy-glib/automatic-proxy-factory.h
	telepathy-glib/base-client.h
	telepathy-glib/base-connection.c
	telepathy-glib/base-contact-list.c
	telepathy-glib/basic-proxy-factory.h
	telepathy-glib/channel-contacts.c
	telepathy-glib/channel-factory-iface.h
	telepathy-glib/channel-request.h
	telepathy-glib/channel.h
	telepathy-glib/cm-message.h
	telepathy-glib/connection-manager.h
	telepathy-glib/connection.h
	telepathy-glib/contact-list-channel.c
	telepathy-glib/contact.c
	telepathy-glib/contact.h
	telepathy-glib/dbus-properties-mixin-internal.h
	telepathy-glib/dbus.c
	telepathy-glib/dbus.h
	telepathy-glib/debug.h
	telepathy-glib/defs.h
	telepathy-glib/errors.h
	telepathy-glib/media-interfaces.c
	telepathy-glib/message-mixin.c
	telepathy-glib/message.h
	telepathy-glib/presence-mixin.c
	telepathy-glib/properties-mixin.c
	telepathy-glib/proxy.h
	telepathy-glib/simple-approver.h
	telepathy-glib/simple-client-factory.h
	telepathy-glib/simple-handler.h
	telepathy-glib/simple-observer.h
	telepathy-glib/text-mixin.c
	telepathy-glib/text-mixin.h
	tests/dbus/account-channel-request.c
	tests/dbus/channel-introspect.c
	tests/dbus/connection-aliasing.c
	tests/dbus/connection-balance.c
	tests/dbus/connection-error.c
	tests/dbus/connection-getinterfaces-failure.c
	tests/dbus/connection-interests.c
	tests/dbus/connection.c
	tests/dbus/contact-lists.c
	tests/dbus/self-presence.c
	tests/dbus/text-mixin.c
	tests/lib/contact-list-manager.c

---