From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 26 Aug 2014 13:51:12 +0000 (+0200)
Subject: Merge branch 'master_fixed'
X-Git-Tag: trac3482_base~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b46dd8a02015f2f595dad1cb65738cedc88706be;p=thirdparty%2Fkea.git

Merge branch 'master_fixed'
---

b46dd8a02015f2f595dad1cb65738cedc88706be