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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Mar 19 20:08:03 2014 +0000

Merge branch 'master' into next

Conflicts:
	configure.ac

---