]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 4 Jun 2015 08:32:05 +0000 (08:32 +0000)
committerHarlan Stenn <stenn@ntp.org>
Thu, 4 Jun 2015 08:32:05 +0000 (08:32 +0000)
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable

bk: 55700d05jcIKRn01X7IxK6Elr-QTNg


Trivial merge