From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 15 Sep 2016 12:54:52 +0000 (+0200)
Subject: [master] Merge branch 'trac4328_1'
X-Git-Tag: trac5006_base~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad68c3942839618c26d7ff017fbac7df139b5d01;p=thirdparty%2Fkea.git

[master] Merge branch 'trac4328_1'
---

ad68c3942839618c26d7ff017fbac7df139b5d01