From: Francis Dupont <fdupont@isc.org>
Date: Mon, 15 Jan 2018 22:28:06 +0000 (+0100)
Subject: [master] merging HEAD
X-Git-Tag: trac5425a_base~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d4cd801efc1ef0bb963cad514672422105f463e;p=thirdparty%2Fkea.git

[master] merging HEAD
---

7d4cd801efc1ef0bb963cad514672422105f463e