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: dd7211e 36ce9d6)

author	Harlan Stenn <stenn@ntp.org>
	Wed, 1 Mar 2017 09:48:06 +0000 (09:48 +0000)
committer	Harlan Stenn <stenn@ntp.org>
	Wed, 1 Mar 2017 09:48:06 +0000 (09:48 +0000)
commit	f674839704dc7110a212eea2104a3d092ed73ec7
tree	0e46c34a2a9437cba32d1802933054e38045f454	tree \| snapshot
parent	dd7211e872b3338cf8b267d4002ea208c7ac0a78	commit \| diff
parent	36ce9d62cc237037bd2cd70005d1b2e55bb46a64	commit \| diff

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

bk: 58b698d6WN50azq4CE_UQzxWurE0iQ

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