[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>
    test-r-multicast-transport-io.c: Simulate behaviour of IP_MULTICAST_LOOP