]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 7 May 2015 02:05:23 +0000 (02:05 +0000)
committerHarlan Stenn <stenn@ntp.org>
Thu, 7 May 2015 02:05:23 +0000 (02:05 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-2805

bk: 554ac8639DorWn4PQWeyCcky7W7gGA


Trivial merge