Merge branch 't/udp_robustness'
authorAndre Noll <maan@systemlinux.org>
Mon, 12 Apr 2010 16:21:23 +0000 (18:21 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 12 Apr 2010 16:21:23 +0000 (18:21 +0200)
1  2 
chunk_queue.c
udp_send.c

diff --cc chunk_queue.c
Simple merge
diff --cc udp_send.c
Simple merge