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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Sep 11 12:02:09 2012 +0100

Merge branch 'telepathy-gabble-0.16'

Conflicts:
	NEWS
	configure.ac
	src/conn-addressing.c
	src/jingle-info.c
	src/media-channel-hold.c
	src/message-util.c
	src/muc-tube-dbus.c
	src/muc-tube-stream.c
	src/olpc-activity.c
	src/presence-cache.c
	src/protocol.c
	src/room-config.c

---