[Telepathy-commits] merge: stream-engine

[Merge Monkey]

Merge to:

  stream-engine

From:

  /home/robot101/public_html/stream-engine-rob

Changes:

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    remove unused error handling code, and stop infinite looping on video stream errors

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    fix LGPL in test files