]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Fri, 25 Sep 2015 06:51:51 +0000 (06:51 +0000)
committerHarlan Stenn <stenn@ntp.org>
Fri, 25 Sep 2015 06:51:51 +0000 (06:51 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 5604ef07n5f6AcTf5TfoM7JgoDuaXA


Trivial merge