[next] telepathy-glib: Merge branch '51441-get-interfaces'

[Xavier Claessens]

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

Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Fri Jul  6 17:01:50 2012 +0100

Merge branch '51441-get-interfaces'

Conflicts:
	telepathy-glib/base-connection-manager.c

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

---