]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sun, 18 Nov 2012 12:32:14 +0000 (07:32 -0500)
committerHarlan Stenn <stenn@ntp.org>
Sun, 18 Nov 2012 12:32:14 +0000 (07:32 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 50a8d54e-yz43eLCo9xl-BGRVIHupQ


Trivial merge