[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>
    Always fully stop whois recovery process if a WHOIS_REPLY was received

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Reschedule whois request before sending out the request sigan, to prevent race conditions if the signal handler reenters the main loop