[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    telepathy-glib 0.7.7 (libtool c:r:a = 10:0:10)

  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>
    Nano version

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Prepare release 0.7.7 (libtool c:r:a 10:0:10)

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