]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity/
authorDamir Tomic <viperus@ntp.org>
Wed, 22 Jul 2015 09:36:17 +0000 (11:36 +0200)
committerDamir Tomic <viperus@ntp.org>
Wed, 22 Jul 2015 09:36:17 +0000 (11:36 +0200)
into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 55af6411El1LYj-TOrRrXrtXoBe79g


Trivial merge