[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/cassidy/public_html/darcs/telepathy-gabble-cassidy

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add tests/test-group-race.py exhibiting a group race bug

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    roster.c: always create the requested channel so the request is not lost if the roster wasn't received yet

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-group-race.py: assert we got the NewChannel signal

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: wrap a big line