]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sun, 30 Dec 2012 04:54:41 +0000 (04:54 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sun, 30 Dec 2012 04:54:41 +0000 (04:54 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-autogen-5.17

bk: 50dfc91174bg8uU-Cr6wpFQ3g5rIpA


Trivial merge