From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 4 Jun 2014 10:38:23 +0000 (+0200)
Subject: [master] Merge branch 'trac3336'
X-Git-Tag: trac3434_base~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3c8a079889411182ade517c85aa4fe5d6b8719a;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3336'
---

b3c8a079889411182ade517c85aa4fe5d6b8719a