From: Jelte Jansen <jelte@isc.org>
Date: Tue, 15 May 2012 09:51:35 +0000 (+0200)
Subject: [master] Merge branch 'trac1889'
X-Git-Tag: trac2351_base~226^2~116
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce7d1aef2ca88084e4dacef97132337dd3e50d6c;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1889'
---

ce7d1aef2ca88084e4dacef97132337dd3e50d6c