From: Marcin Siodelski <marcin@isc.org>
Date: Fri, 8 Jul 2016 20:34:59 +0000 (+0200)
Subject: [master] Merge branch 'trac4497_rebase'
X-Git-Tag: trac4551_base~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e50d2ebe998ec3faad8ade22b6971d6584c81044;p=thirdparty%2Fkea.git

[master] Merge branch 'trac4497_rebase'
---

e50d2ebe998ec3faad8ade22b6971d6584c81044