From: Damir Tomic <viperus@ntp.org>
Date: Thu, 25 Jun 2015 07:22:01 +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=37749f3f668da11a685be856c1df86d199d6c10c;p=thirdparty%2Fntp.git

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

bk: 558bac19lfUVb4QC_qDJRKpdUniEPQ
---

37749f3f668da11a685be856c1df86d199d6c10c