From: Miroslav Lichvar Date: Wed, 20 Jan 2016 11:18:42 +0000 (+0100) Subject: Merge branch '2.2-security' X-Git-Tag: 2.3-pre1~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b80df5152ac9642174d338ec454392a1360e60f4;p=thirdparty%2Fchrony.git Merge branch '2.2-security' --- b80df5152ac9642174d338ec454392a1360e60f4