From: Lokesh Walase <lokeshw24@ntp.org>
Date: Sat, 20 Jun 2015 09:54:44 +0000 (+0530)
Subject: Merge lokeshw24@psp-deb1.ntp.org:/home/viperus/ntp-stable-unity
X-Git-Tag: NTP_4_3_43~2^2~7^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f319cfb35afc46e0524442eec8cc04614eb0457;p=thirdparty%2Fntp.git

Merge lokeshw24@psp-deb1.ntp.org:/home/viperus/ntp-stable-unity
into  dadasgift.(none):/home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity

bk: 55853864cSTkVhmQmvMAMVt2eNB4Fw
---

1f319cfb35afc46e0524442eec8cc04614eb0457