[next] telepathy-glib: Merge remote-tracking branch 'origin/master' into next-merge

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Oct 29 11:29:57 2013 +0100

Merge remote-tracking branch 'origin/master' into next-merge

Conflicts were pretty hardcore:
- all the spec conflicts have been resolved with --ours as I just synced on
the latest version of spec-next (0.99.4)
- docs conflicts have been solved manually while updating to the new API
symbols.
- telepathy-glib/contact.c was a nightmare to solve...

Conflicts:
	NEWS
	configure.ac
	docs/reference/telepathy-glib-docs.sgml
	docs/reference/telepathy-glib-sections.txt
	spec/Channel_Dispatcher_Interface_Messages1.xml
	spec/Connection_Interface_IRC_Command1.xml
	spec/Connection_Interface_Renaming1.xml
	spec/Makefile.am
	spec/all.xml
	telepathy-glib/abi.am
	telepathy-glib/account-manager.c
	telepathy-glib/account.c
	telepathy-glib/channel-dispatcher.xml
	telepathy-glib/connection.xml
	telepathy-glib/contact.c
	telepathy-glib/extra-gtkdoc.h
	telepathy-glib/util.c
	telepathy-glib/util.h
	tests/lib/simple-account.c

---