]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Wed, 17 Jun 2015 08:27:51 +0000 (08:27 +0000)
committerHarlan Stenn <stenn@ntp.org>
Wed, 17 Jun 2015 08:27:51 +0000 (08:27 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 55812f87kA_gO5Owf7SNy5yvmtvjlw


Trivial merge