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

[master] Merge branch 'trac3422'
---

e1d164c7a9a54a7aacea88c8c57cd2826e06012b