]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Fri, 9 May 2014 05:39:48 +0000 (22:39 -0700)
committerHarlan Stenn <stenn@ntp.org>
Fri, 9 May 2014 05:39:48 +0000 (22:39 -0700)
into  hms-mbp11.local:/Users/harlan/src/ntp-dev

bk: 536c6a24GfsAw-7pkr3ydgMLWgu5Iw


Trivial merge