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

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Oct 29 08:26:26 2013 +0100

Merge branch 'telepathy-gabble-0.18'

Conflicts:
	src/media-factory.c
	tests/twisted/jingle/google-relay.py

---