From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 20 Nov 2018 19:48:44 +0000 (-0500)
Subject: [master] Remerged into merge of !120
X-Git-Tag: 204-move-models-base~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e304fae48d0d0658fd39a21aba9da528b4cc6f4;p=thirdparty%2Fkea.git

[master] Remerged into merge of !120
---

9e304fae48d0d0658fd39a21aba9da528b4cc6f4