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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Aug  9 17:32:42 2013 +0100

Merge branch 'telepathy-gabble-0.18'

Conflicts:
	NEWS
	configure.ac

---