[Merge] lp:~noskcaj/ubuntu/utopic/obexftp/merge into lp:ubuntu/obexftp

[Jackson Doak]

Jackson Doak has proposed merging lp:~noskcaj/ubuntu/utopic/obexftp/merge into lp:ubuntu/obexftp.

Requested reviews:
  Ubuntu branches (ubuntu-branches)

For more details, see:
https://code.launchpad.net/~noskcaj/ubuntu/utopic/obexftp/merge/+merge/222568

Merge from debian.
-- 
https://code.launchpad.net/~noskcaj/ubuntu/utopic/obexftp/merge/+merge/222568
Your team Ubuntu branches is requested to review the proposed merge of lp:~noskcaj/ubuntu/utopic/obexftp/merge into lp:ubuntu/obexftp.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 5970 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140609/ff14f114/attachment.diff>