]> 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:33:06 +0000 (09:33 +0000)
committerHarlan Stenn <stenn@ntp.org>
Thu, 2 Jul 2015 09:33:06 +0000 (09:33 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/perlinger/ntp-stable-2867

bk: 55950552MIh0nKFXDr9XCUaHVPkTaw


Trivial merge