]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 12 Aug 2014 01:55:06 +0000 (01:55 +0000)
committerHarlan Stenn <stenn@ntp.org>
Tue, 12 Aug 2014 01:55:06 +0000 (01:55 +0000)
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/phk/ntp-dev

bk: 53e973fasF8JuoWf4OxEUD0PvoAtUw


Trivial merge