From: Marcin Siodelski <marcin@isc.org>
Date: Tue, 12 Apr 2016 10:29:16 +0000 (+0200)
Subject: [master] Merge branch 'github19'
X-Git-Tag: trac4106_update_base~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d260a70d6aa0baecd68131bc35f58f097aa77bcc;p=thirdparty%2Fkea.git

[master] Merge branch 'github19'
---

d260a70d6aa0baecd68131bc35f58f097aa77bcc