From: Stephen Morris <stephen@isc.org>
Date: Mon, 30 Nov 2015 19:49:50 +0000 (+0000)
Subject: [master] Merge branch 'trac4208'
X-Git-Tag: trac4231_base~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf6f3d495604942a395b51bbe4c37001b7541242;p=thirdparty%2Fkea.git

[master] Merge branch 'trac4208'
---

bf6f3d495604942a395b51bbe4c37001b7541242