From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 19 May 2016 12:17:25 +0000 (+0200)
Subject: [master] Merge branch 'trac4499'
X-Git-Tag: trac4106_update_base~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48c20790480d5ed7bfde0ef7b052dd4a9745607d;p=thirdparty%2Fkea.git

[master] Merge branch 'trac4499'
---

48c20790480d5ed7bfde0ef7b052dd4a9745607d