]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'trac2934'
authorJINMEI Tatuya <jinmei@isc.org>
Thu, 23 May 2013 22:19:26 +0000 (15:19 -0700)
committerJINMEI Tatuya <jinmei@isc.org>
Thu, 23 May 2013 22:19:26 +0000 (15:19 -0700)
1  2 
configure.ac
src/lib/asiodns/tcp_server.cc

diff --cc configure.ac
Simple merge
Simple merge