[next] telepathy-gabble: Merge branch 'master' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Nov  4 13:39:35 2013 +0000

Merge branch 'master' into next

Conflicts:
	configure.ac
	extensions/Channel_Type_FileTransfer_Future.xml
	extensions/Connection_Future.xml
	extensions/all.xml
	src/conn-location.c
	src/connection.c
	src/ft-channel.c
	src/media-factory.c
	tests/twisted/constants.py
	tests/twisted/servicetest.py

---