From: Damir Tomic <viperus@ntp.org>
Date: Sun, 14 Jun 2015 05:47:07 +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=63e23e6663abefa544e35661318f26e917284a0d;p=thirdparty%2Fntp.git

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

bk: 557d155b7sWiEeUzwPP_CIaplCRD7w
---

63e23e6663abefa544e35661318f26e917284a0d