]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3728e44 cfb3ee6)
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Wed, 8 Jan 2014 05:34:46 +0000 (05:34 +0000)
committerHarlan Stenn <stenn@ntp.org>
Wed, 8 Jan 2014 05:34:46 +0000 (05:34 +0000)
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 52cce376idZ8hUUtZdcVe-_1RFqeqQ


Trivial merge
Mirror of https://github.com/ntp-project/ntp.git