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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu May 30 12:55:31 2013 +0100

Merge branch 'telepathy-gabble-0.16'

Conflicts:
	NEWS
	configure.ac
	lib/ext/wocky

---