[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-smcv-reentrant4

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    glib-client-gen: don't generate *_block_on_*

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove *_block_on_* from version script and docs