telepathy-gabble: Merge remote-tracking branch 'wjt/xmpp-console'

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Oct 14 15:35:26 2013 +0100

Merge remote-tracking branch 'wjt/xmpp-console'

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66085
Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
Conflicts:
	plugins/console/channel.c

---