[Telepathy-commits] merge: stream-engine-0.4

[Merge Monkey]

Merge to:

  stream-engine-0.4

From:

  /home/tester/public_html/darcs/stream-engine-0.4-fixes-tester

Changes:

  Olivier Crete <olivier.crete at collabora.co.uk>
    Pass the codec-id-blacklist onto farsight