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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Sep  9 14:24:13 2013 +0100

Merge branch 'telepathy-gabble-0.18'

Conflicts:
	NEWS
	configure.ac
	lib/ext/wocky

---