From: Jelte Jansen <jelte@isc.org>
Date: Thu, 15 Mar 2012 14:29:48 +0000 (+0100)
Subject: [master] Merge branch 'trac1747'
X-Git-Tag: trac2351_base~226^2~116^2~117
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12f57073eb9f5ff5d11035852e253d25071debab;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1747'
---

12f57073eb9f5ff5d11035852e253d25071debab