telepathy-mission-control: Merge branch 'telepathy-mission-control-5.16'

[Guillaume Desmottes]

Module: telepathy-mission-control
Branch: master
Commit: 190de711459a51eb236b773a57b0c188ebf1da6a
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=190de711459a51eb236b773a57b0c188ebf1da6a

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Jun 10 16:14:07 2014 +0200

Merge branch 'telepathy-mission-control-5.16'

Conflicts:
	src/mcd-account.c

---