[Merge] ~smoser/ubuntu/+source/tftp-hpa:merge into ~ubuntu-server-dev/ubuntu/+source/tftp-hpa:master

[Scott Moser]

Scott Moser has proposed merging ~smoser/ubuntu/+source/tftp-hpa:merge into ~ubuntu-server-dev/ubuntu/+source/tftp-hpa:master.

Requested reviews:
  Kick In (kick-d)
  Robie Basak (racb)

For more details, see:
https://code.launchpad.net/~smoser/ubuntu/+source/tftp-hpa/+git/tftp-hpa/+merge/284751
-- 
Your team Ubuntu Server Developers is subscribed to branch ~ubuntu-server-dev/ubuntu/+source/tftp-hpa:master.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 43048 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20160202/4fd401f5/attachment-0001.diff>