From: Michal 'vorner' Vaner Date: Thu, 16 Feb 2012 09:30:05 +0000 (+0100) Subject: Merge ongoing #1593 into #1534 X-Git-Tag: trac2351_base~226^2~116^2~166^2~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e494212d02fa6efcb437f966708992de8b02cb74;p=thirdparty%2Fkea.git Merge ongoing #1593 into #1534 To minimize future conflicts, the #1593 (sockcreator cleanup) might have severe impact on the code. --- e494212d02fa6efcb437f966708992de8b02cb74