From: Stephen Morris <stephen@isc.org>
Date: Fri, 1 Aug 2014 16:49:08 +0000 (+0100)
Subject: [master] Merge branch 'trac3431'
X-Git-Tag: trac3482_base~67
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b1b54fe865165da29036bf981c7e40dcfffa462;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3431'
---

5b1b54fe865165da29036bf981c7e40dcfffa462