[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tests/dbus/Makefile.am: re-order

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    When a channel's connection becomes invalidated, take a temporary ref to the channel while calling out to user code (fd.o #15644)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add regression test for #15644