From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 22 Jun 2016 11:28:21 +0000 (-0400)
Subject: [4277] Pull 4275 changes
X-Git-Tag: trac4551_base~12^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e11527e91be1e7e3a3bd89da0d74c205d855735;p=thirdparty%2Fkea.git

[4277] Pull 4275 changes

    Merge branch 'master' into trac4277
---

7e11527e91be1e7e3a3bd89da0d74c205d855735