From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 11 Mar 2015 18:38:28 +0000 (-0400)
Subject: [master] Merge branch 'trac3742'
X-Git-Tag: trac3764_base~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec427e4c9d008abc800f87eda3c0024b35e4c2e2;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3742'
---

ec427e4c9d008abc800f87eda3c0024b35e4c2e2