]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 20 Jun 2015 23:12:59 +0000 (23:12 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sat, 20 Jun 2015 23:12:59 +0000 (23:12 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 5585f37bj0vnCzUp3CPWSmX2ZN2MFg


Trivial merge