telepathy-gabble: Merge branch 'telepathy-gabble-0.16'

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Aug  6 15:29:35 2013 +0100

Merge branch 'telepathy-gabble-0.16'

Conflicts:
	NEWS

---