]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity/
authorDamir Tomic <viperus@ntp.org>
Fri, 7 Aug 2015 08:21:27 +0000 (10:21 +0200)
committerDamir Tomic <viperus@ntp.org>
Fri, 7 Aug 2015 08:21:27 +0000 (10:21 +0200)
into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 55c46a87ceRM2pPJJhy0dttirLvbGg


Trivial merge