From: Marcin Siodelski <marcin@isc.org>
Date: Fri, 16 Sep 2016 15:29:21 +0000 (+0200)
Subject: [master] Merge branch 'github30'
X-Git-Tag: trac5006_base~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e40a54a8e24b5f6427edd4afcd5cdc15012b8866;p=thirdparty%2Fkea.git

[master] Merge branch 'github30'
---

e40a54a8e24b5f6427edd4afcd5cdc15012b8866