telepathy-gabble: Merge branch 'telepathy-gabble-0.18'

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Thu Oct  3 09:55:46 2013 +0200

Merge branch 'telepathy-gabble-0.18'

Conflicts:
	src/private-tubes-factory.c

---