]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 28 Feb 2015 12:13:49 +0000 (12:13 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sat, 28 Feb 2015 12:13:49 +0000 (12:13 +0000)
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 54f1b0fdtF6jc3O7a0aRa7HnTefgiw


Trivial merge