]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 2 Jul 2015 09:31:03 +0000 (09:31 +0000)
committerHarlan Stenn <stenn@ntp.org>
Thu, 2 Jul 2015 09:31:03 +0000 (09:31 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/perlinger/ntp-stable-2864

bk: 559504d7ABsQ1rniGly4lgbjJqXuWg


Trivial merge