telepathy-gabble: Merge branch 'tcp-nodelay'

[Jonny Lamb]

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

Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Mon Sep 17 15:08:08 2012 +0100

Merge branch 'tcp-nodelay'

---