]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Merge #1534
authorMichal 'vorner' Vaner <michal.vaner@nic.cz>
Mon, 27 Feb 2012 18:21:02 +0000 (19:21 +0100)
committerMichal 'vorner' Vaner <michal.vaner@nic.cz>
Mon, 27 Feb 2012 18:21:02 +0000 (19:21 +0100)
Conflicts:
src/bin/sockcreator/Makefile.am

1  2 
src/bin/sockcreator/sockcreator.cc
src/bin/sockcreator/sockcreator.h

Simple merge
Simple merge