[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  mirror-salut-em-resolved

Changes:

  Emanuele Aina <em at nerd.ocracy.org>
    Replaced two variables used as constants with thei values

  Emanuele Aina <em at nerd.ocracy.org>
    Resolved some conflicts

  Emanuele Aina <em at nerd.ocracy.org>
    Factored the file chunking code out of the test

  Emanuele Aina <em at nerd.ocracy.org>
    Add a testcase for GibberXmppConnection and check its istantiation

  Emanuele Aina <em at nerd.ocracy.org>
    Ported the GibberRMulticastSender test to Check using its looping tests support

  Emanuele Aina <em at nerd.ocracy.org>
    Ported the SASL test to Check using its looping tests support

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Add a utility method to make full duplex connections

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Add test for causal ordering in the mesh

  Emanuele Aina <em at nerd.ocracy.org>
    Fixed some conflicts

  Emanuele Aina <em at nerd.ocracy.org>
    Check the parsing of a valid message

  Emanuele Aina <em at nerd.ocracy.org>
    Ported the GibberRMulticastPacket test to Check using its looping tests support