From: Stephen Morris <stephen@isc.org>
Date: Tue, 3 Mar 2015 16:27:16 +0000 (+0000)
Subject: [master] Merge branch 'trac3729'
X-Git-Tag: trac3745_base~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e0882c3a5e02fa6bc2c1587ea25fb7db3b4d824;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3729'
---

3e0882c3a5e02fa6bc2c1587ea25fb7db3b4d824