From: Damir Tomic <viperus@ntp.org>
Date: Sun, 7 Jun 2015 08:52:06 +0000 (+0200)
Subject: Merge psp-deb1.ntp.org:ntp-stable-unity
X-Git-Tag: NTP_4_3_40~6^2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44d7fc3e187678ea7f8bef59661ba9426a7caa5b;p=thirdparty%2Fntp.git

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

bk: 55740636QmMX1iukf7Rb0p4l5au5Pw
---

44d7fc3e187678ea7f8bef59661ba9426a7caa5b