From: Marcin Siodelski <marcin@isc.org>
Date: Tue, 3 Feb 2015 17:47:36 +0000 (+0100)
Subject: [master] Merge branch 'trac3647'
X-Git-Tag: trac3712_base~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5455d96cbf773e678bd6b1c3e31bfdeb617e6c13;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3647'
---

5455d96cbf773e678bd6b1c3e31bfdeb617e6c13