telepathy-salut: Merge branch 'cheerio-tubes'

[Jonny Lamb]

Module: telepathy-salut
Branch: master
Commit: 9ad89f9a9a35467ce5649070b0207a91cbbd251b
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=9ad89f9a9a35467ce5649070b0207a91cbbd251b

Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Tue Aug 28 14:21:04 2012 +0100

Merge branch 'cheerio-tubes'

Conflicts:
	src/tubes-channel.c

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

---