]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Merge branch 'work/abortsocket'
authorMichal 'vorner' Vaner <michal.vaner@nic.cz>
Tue, 31 Jan 2012 11:18:12 +0000 (12:18 +0100)
committerMichal 'vorner' Vaner <michal.vaner@nic.cz>
Tue, 31 Jan 2012 11:18:12 +0000 (12:18 +0100)

Trivial merge