]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 3 Mar 2014 06:13:21 +0000 (22:13 -0800)
committerHarlan Stenn <stenn@ntp.org>
Mon, 3 Mar 2014 06:13:21 +0000 (22:13 -0800)
into  hms-mbp11.local:/Users/harlan/src/ntp-dev

bk: 53141d811IDw1xjsvx_2Q4UziTghng


Trivial merge