[Merge] lp:~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2 into lp:ubuntu/saucy-proposed/sflphone

[Jackson Doak]

Jackson Doak has proposed merging lp:~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2 into lp:ubuntu/saucy-proposed/sflphone.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)
Related bugs:
  Bug #1196978 in sflphone (Ubuntu): "Please update sflphone to 1.2.3"
  https://bugs.launchpad.net/ubuntu/+source/sflphone/+bug/1196978

For more details, see:
https://code.launchpad.net/~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2/+merge/173879

merged from upstream
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2/+merge/173879
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2 into lp:ubuntu/saucy-proposed/sflphone.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 524288 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20130710/847bfd32/attachment-0001.diff>