git.ipfire.org Git - thirdparty/ntp.git/commit

]> git.ipfire.org Git - thirdparty/ntp.git/commit

projects / thirdparty / ntp.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1545c91 e666f07)

author	Harlan Stenn <stenn@ntp.org>
	Thu, 12 Oct 2017 09:10:05 +0000 (09:10 +0000)
committer	Harlan Stenn <stenn@ntp.org>
	Thu, 12 Oct 2017 09:10:05 +0000 (09:10 +0000)
commit	ccbe4b467d33bb84f779e2b5680fa2f0c7e60e4e
tree	159c549cae6503ba797af9351ebc8cd75827af99	tree \| snapshot
parent	1545c91e4d19fa0783e0b16f6abb914886e158f8	commit \| diff
parent	e666f0702c6a5accdf109aa327a137ce8abde8e4	commit \| diff

Merge psp-deb1.ntp.org:/home/abe/ntp-stable-3365/
into psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-3365

bk: 59df316d5fa0d0IVh5AsUzW1_7DAng

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