[next] telepathy-glib: Merge commit ' b0a00c67c61b6b8287aee480d9f5aaa94d0f4979' into next

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Wed Sep 25 15:40:07 2013 -0400

Merge commit 'b0a00c67c61b6b8287aee480d9f5aaa94d0f4979' into next

Conflicts:
	telepathy-glib/connection-manager.c

---