From: Damir Tomic <viperus@ntp.org>
Date: Thu, 18 Jun 2015 09:13:56 +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=08cb544624332e2fe72f569656ec0e3b0ae34c04;p=thirdparty%2Fntp.git

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

bk: 55828bd43ElD-OuU-96pgnOavbOvGw
---

08cb544624332e2fe72f569656ec0e3b0ae34c04