From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 1 Sep 2016 16:03:04 +0000 (+0200)
Subject: [master] Merge branch 'github22'
X-Git-Tag: trac5004_base~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c5b4a5981cf642ebb9aecb8acc07b87abdccbd91;p=thirdparty%2Fkea.git

[master] Merge branch 'github22'
---

c5b4a5981cf642ebb9aecb8acc07b87abdccbd91