[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/sjoerd/telepathy-salut-sjoerd

Changes:

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberRMulticastCausalTransport: When reconnecting after a reset, reset the resetting flag

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    continous-failure.py: Update test to send messages on a regular basis to see check if data is still send after a reset

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    While resetting just drop messages, don't send it through to a lower transport