From: Jelte Jansen <jelte@isc.org>
Date: Wed, 2 May 2012 14:42:10 +0000 (+0200)
Subject: [master] Merge branch 'trac1520'
X-Git-Tag: trac2351_base~226^2~116^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f18039bc751a8f498c1f832196e2ecc7b997b2a;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1520'
---

0f18039bc751a8f498c1f832196e2ecc7b997b2a