[Telepathy-commits] merge: telepathy-glib-0.6

[Merge Monkey]

Merge to:

  telepathy-glib-0.6

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    In tp_base_connection_change_status, allocate priv->disconnect_requests if necessary, so Disconnect() will do the right thing (fd.o #15796)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Populate the NEWS file

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Prepare release 0.6.2

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    telepathy-glib 0.6.2

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    In tp_base_connection_finish_shutdown, make assertions about our state (part of fd.o #15796)