]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge stenn@psp-deb1.ntp.org:ntp-stable-p9
authorHarlan Stenn <stenn@ntp.org>
Wed, 9 Nov 2016 08:27:53 +0000 (00:27 -0800)
committerHarlan Stenn <stenn@ntp.org>
Wed, 9 Nov 2016 08:27:53 +0000 (00:27 -0800)
into  max.pfcs.com:/homes/harlan/src/ntp-stable-p9

bk: 5822de09zM2foaZKJSkwfCAD7g__0g

1  2 
ntpd/ntp_proto.c

Simple merge