From: Damir Tomic <viperus@ntp.org>
Date: Sun, 28 Jun 2015 18:39:25 +0000 (+0200)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity/
X-Git-Tag: NTP_4_3_53~8^2~2^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cc77346bc5ff5cbbe68196d0dd1e3c450eb3db4;p=thirdparty%2Fntp.git

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

bk: 55903f5dhnJ4EF432wRckZhb9e2lJw
---

6cc77346bc5ff5cbbe68196d0dd1e3c450eb3db4