[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>
    Add an overriddable UnknownOutput function

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Add initial causal ordering support

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Fix conflicts

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Add a utility function to add MeshNode objects directly

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Unref the hash table in dispose instead of ref

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Test with 3 senders instead of two

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Add comment to the hash table about what key, value's it has