]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity/
authorDamir Tomic <viperus@ntp.org>
Tue, 7 Jul 2015 06:32:25 +0000 (08:32 +0200)
committerDamir Tomic <viperus@ntp.org>
Tue, 7 Jul 2015 06:32:25 +0000 (08:32 +0200)
into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 559b7279pSs-4cBjCuT3ZsM9E04mfQ


Trivial merge