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: a204325 d3d1dfe)

author	Harlan Stenn <stenn@ntp.org>
	Sun, 13 Nov 2016 02:18:48 +0000 (02:18 +0000)
committer	Harlan Stenn <stenn@ntp.org>
	Sun, 13 Nov 2016 02:18:48 +0000 (02:18 +0000)
commit	6c7e20bac95b78fac869c7b1dddac8d4df64b3aa
tree	943a7ea87a44a127c2a6a95cee66042da37ba8a2	tree
parent	a20432563e358568ae4891189269431d56b6846d	commit \| diff
parent	d3d1dfeada11e2f68ace84d4853f4c3af3574e9e	commit \| diff

Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-3129
into psp-deb1.ntp.org:/home/stenn/ntp-stable-3129

bk: 5827cd88nuI57EngRKExZX_yjrs0TA

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