From: Damir Tomic <viperus@ntp.org>
Date: Fri, 19 Jun 2015 13:52:56 +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=b632cd1fad254cbd6dda8eb15b4ec050ae5385d3;p=thirdparty%2Fntp.git

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

bk: 55841eb8Cgj_ux8R3C5e-SOTTmRH-g
---

b632cd1fad254cbd6dda8eb15b4ec050ae5385d3