telepathy-mission-control: Merge branch 'xdg-keyfile-35896'

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 20 15:09:20 2012 +0100

Merge branch 'xdg-keyfile-35896'

Reviewed-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35896
Conflicts:
	src/mcd-account-manager-default.c

---