]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:/home/tflendrich/kod/head/ntp-stable-unity
authorHarlan Stenn <stenn@ntp.org>
Sat, 20 Jun 2015 01:00:11 +0000 (01:00 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sat, 20 Jun 2015 01:00:11 +0000 (01:00 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity

bk: 5584bb1bnZF78hW9hDHEXVvvuQm5Sw


Trivial merge