From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 2 Nov 2016 21:08:36 +0000 (+0100)
Subject: [master] Merge branch 'github31'
X-Git-Tag: trac5057_base~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69a5722bf3b41bf3b2bc0c2bcac966c23c08f62d;p=thirdparty%2Fkea.git

[master] Merge branch 'github31'
---

69a5722bf3b41bf3b2bc0c2bcac966c23c08f62d