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

[master] Merge branch 'trac3480'
---

2a55a469dde8fcc053b49e287c30d0906baa91b4