[Merge] lp:~noskcaj/ubuntu/trusty/libbsd/merge into lp:ubuntu/libbsd

[Jackson Doak]

Jackson Doak has proposed merging lp:~noskcaj/ubuntu/trusty/libbsd/merge into lp:ubuntu/libbsd.

Requested reviews:
  Ubuntu branches (ubuntu-branches)

For more details, see:
https://code.launchpad.net/~noskcaj/ubuntu/trusty/libbsd/merge/+merge/211137

Merge from debian. Fixes conflict with libelf-dev + packaging improvements
-- 
https://code.launchpad.net/~noskcaj/ubuntu/trusty/libbsd/merge/+merge/211137
Your team Ubuntu branches is requested to review the proposed merge of lp:~noskcaj/ubuntu/trusty/libbsd/merge into lp:ubuntu/libbsd.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 18269 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140314/ff7addbd/attachment.diff>