From: Damir Tomic <viperus@ntp.org>
Date: Sat, 4 Jul 2015 08:44:31 +0000 (+0200)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity/
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06424e6f2076530f58e835864fe2866aae8d2fe1;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity/
into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 55979cefUfSmuYrtQgHNHfC6M1cyLQ
---

06424e6f2076530f58e835864fe2866aae8d2fe1