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-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3767d85adb85057d35bdc45f4406de37460445ca;p=thirdparty%2Fntp.git

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

bk: 55740636QmMX1iukf7Rb0p4l5au5Pw
---

3767d85adb85057d35bdc45f4406de37460445ca