Merge remote-tracking branch 'origin/master'
commit05ffcecaa8bbaedc81b42ea240f34f2ad0b5f126
authorH. Peter Anvin <hpa@zytor.com>
Tue, 10 May 2011 04:09:18 +0000 (9 21:09 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 10 May 2011 04:09:18 +0000 (9 21:09 -0700)
tree757a01782742a7f0991c8f19597b4b3eb14d003a
parentad5aab9281b6d67b77537b4aabfe5bc070e7fe99
parent915f62f5c76d7bd953b758d477b542acf6a3bf65
Merge remote-tracking branch 'origin/master'
tftpd/tftpd.c