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

[master] Merge branch 'trac3479'
---

bca0bae285de9ce904c0afd21af777dac2edb4e6