[Merge] lp:~om26er/ubuntu/maverick/telepathy-haze/telepathy-haze-fix-652944 into lp:ubuntu/maverick/telepathy-haze

[Omer Akram]

Omer Akram has proposed merging lp:~om26er/ubuntu/maverick/telepathy-haze/telepathy-haze-fix-652944 into lp:ubuntu/maverick/telepathy-haze.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)
Related bugs:
  #652944 All my ICQ contacts have a webcam icon next to them in Empathy
  https://bugs.launchpad.net/bugs/652944


backported from upstream git http://git.collabora.co.uk/?p=telepathy-haze.git;a=commitdiff;h=924fa3d90eb1a4949e431b0bd6284071f0d5b38b so that people dont get tricked into believing yahoo, icq etc support a/v calls
-- 
https://code.launchpad.net/~om26er/ubuntu/maverick/telepathy-haze/telepathy-haze-fix-652944/+merge/41597
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~om26er/ubuntu/maverick/telepathy-haze/telepathy-haze-fix-652944 into lp:ubuntu/maverick/telepathy-haze.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 2245 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20101123/bdbd1d0f/attachment.diff