telepathy-gabble: Merge branch 'only-one-tube'

[Jonny Lamb]

Module: telepathy-gabble
Branch: master
Commit: d4c7189ee40a9eb8a0831c78b2dbd5a54e221237
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=d4c7189ee40a9eb8a0831c78b2dbd5a54e221237

Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Tue Aug 28 12:19:56 2012 +0100

Merge branch 'only-one-tube'

Conflicts:
	src/tubes-channel.c
	src/tubes-channel.h

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

---