[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>
    GibberRMulticastSender: Requested whois sender is now in data.whois_request.sender_id instead of sender

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberRMulticastTransport. Change the logic to cope with the fact that WHOIS_REQUEST puts the requested sender name in another field and add forward compatibility with unique id polling

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Whitespace fixes

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    check-gibber-r-multicast-transport.c: Sender id's should never be 0, cope with polling for a unique id

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Seperate sender and requested sender in Whois Request packets