[Telepathy-commits] merge: stream-engine

[Merge Monkey]

Merge to:

  stream-engine

From:

  /home/tester/public_html/darcs-branches/stream-engine-misc-fixes-tester

Changes:

  Olivier Crete <olivier.crete at collabora.co.uk>
    Fix asserts