[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tests/twisted/Makefile.am: consider it to be a failure if Gabble dumps core

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Release weak ref before calling into user code in GabbleDisco, to avoid crashes if the user code causes the weakly reffed object to be destroyed

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleDisco: temporarily ref the disco object while calling out to user code

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update NEWS