[next] telepathy-gabble: Merge branch 'telepathy-gabble-0.18'

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Mar 19 14:28:58 2014 +0000

Merge branch 'telepathy-gabble-0.18'

---