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-Tag: NTP_4_2_8P3_RC3~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c434f2c1e41d574ae9ec8d9f15ab05d146fe500;p=thirdparty%2Fntp.git

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

bk: 558bac19lfUVb4QC_qDJRKpdUniEPQ
---

5c434f2c1e41d574ae9ec8d9f15ab05d146fe500