]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Thu, 28 Nov 2013 05:56:57 +0000 (05:56 +0000)
committerHarlan Stenn <stenn@ntp.org>
Thu, 28 Nov 2013 05:56:57 +0000 (05:56 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev-2272

bk: 5296db29n9xN-UshwBxd2ejGAbmFNg


Trivial merge