[next] telepathy-mission-control: Merge branch 'master' into next

[Simon McVittie]

Module: telepathy-mission-control
Branch: next
Commit: b1d129e4127178b2e49e19cab3881492a233ad75
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=b1d129e4127178b2e49e19cab3881492a233ad75

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Oct 16 14:04:30 2013 +0100

Merge branch 'master' into next

Tests pass with telepathy-glib 0.99.2.

Conflicts:
	src/Makefile.am
	src/mcd-account-manager-priv.h
	src/mcd-account-manager.c
	src/mcd-account-priv.h
	src/mcd-account.c
	src/mcd.xml
	tests/twisted/account-manager/hidden.py
	tests/twisted/constants.py
	tests/twisted/mctest.py
	xml/Account_Interface_Hidden1.xml
	xml/Account_Manager_Interface_Hidden1.xml
	xml/Makefile.am
	xml/nmc5.xml

---