]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 7 Jun 2015 09:27:40 +0000 (09:27 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sun, 7 Jun 2015 09:27:40 +0000 (09:27 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/perlinger/ntp-stable-2830

bk: 55740e8cWYbY4-07WQCYcgwnVgh0yA


Trivial merge