From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 20 Jul 2015 13:31:03 +0000 (+0200)
Subject: [master] Merge branch 'trac3949'
X-Git-Tag: trac4006_base~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=023973cbce44e5fb92a2bc45e69f2786d5152091;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3949'
---

023973cbce44e5fb92a2bc45e69f2786d5152091