]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorMartin Burnicki <burnicki@ntp.org>
Mon, 22 Jun 2015 10:40:47 +0000 (10:40 +0000)
committerMartin Burnicki <burnicki@ntp.org>
Mon, 22 Jun 2015 10:40:47 +0000 (10:40 +0000)
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/burnicki/ntp-stable+smear

bk: 5587e62f86GDUT7T4Y-wspbxTi256Q


Trivial merge