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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Jun  6 16:28:31 2013 +0100

Merge branch 'telepathy-gabble-0.16'

Conflicts:
	NEWS
	configure.ac

---