From: Harlan Stenn Date: Sat, 20 Jun 2015 20:25:03 +0000 (+0000) Subject: Merge psp-at1.ntp.org:/home/viperus/ntp-stable-unity X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbaa84d1dbc7596242d38c4db2a017720bd26e0c;p=thirdparty%2Fntp.git Merge psp-at1.ntp.org:/home/viperus/ntp-stable-unity into psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity bk: 5585cc1fnNmysPe6Cf-KdbCw02ZJXA --- bbaa84d1dbc7596242d38c4db2a017720bd26e0c