[Merge] lp:~townsend/ubuntu/saucy/nautilus-share/fix-lp1214534 into lp:ubuntu/nautilus-share

[Christopher Townsend]

Christopher Townsend has proposed merging lp:~townsend/ubuntu/saucy/nautilus-share/fix-lp1214534 into lp:ubuntu/nautilus-share.

Requested reviews:
  Ubuntu branches (ubuntu-branches)
Related bugs:
  Bug #1214534 in nautilus-share (Ubuntu): ""Sharing Options" and Share tab wording needs to be more clear"
  https://bugs.launchpad.net/ubuntu/+source/nautilus-share/+bug/1214534

For more details, see:
https://code.launchpad.net/~townsend/ubuntu/saucy/nautilus-share/fix-lp1214534/+merge/181160

Ayatana Design (John Lea) has requested that the "Sharing Options" in the right-click menu and "Share" in the Nautilus properties tab be changed to "Local network share".
-- 
https://code.launchpad.net/~townsend/ubuntu/saucy/nautilus-share/fix-lp1214534/+merge/181160
Your team Ubuntu branches is requested to review the proposed merge of lp:~townsend/ubuntu/saucy/nautilus-share/fix-lp1214534 into lp:ubuntu/nautilus-share.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 47134 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20130820/c3813c4e/attachment-0001.diff>