From: Marcin Siodelski <marcin@isc.org>
Date: Tue, 13 Sep 2016 11:40:31 +0000 (+0200)
Subject: [master] Merge branch 'trac4261'
X-Git-Tag: trac5006_base~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=028dd49f4fa4843e68e23d11c237e9f4683470ba;p=thirdparty%2Fkea.git

[master] Merge branch 'trac4261'
---

028dd49f4fa4843e68e23d11c237e9f4683470ba