]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/backroom/snaps/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 19 Nov 2012 06:48:04 +0000 (01:48 -0500)
committerHarlan Stenn <stenn@ntp.org>
Mon, 19 Nov 2012 06:48:04 +0000 (01:48 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 50a9d624C5g8o7tVQ784Bz4lJzHqPQ


Trivial merge