auto merge of #10581 : pcwalton/rust/dedo, r=pcwalton

author bors <bors@rust-lang.org>

Tue, 26 Nov 2013 20:13:03 +0000 (12:13 -0800)

committer bors <bors@rust-lang.org>

Tue, 26 Nov 2013 20:13:03 +0000 (12:13 -0800)
author bors <bors@rust-lang.org>
Tue, 26 Nov 2013 20:13:03 +0000 (12:13 -0800)
committer bors <bors@rust-lang.org>
Tue, 26 Nov 2013 20:13:03 +0000 (12:13 -0800)
diff --cc src/librustuv/addrinfo.rs
Simple merge
diff --cc src/librustuv/net.rs
Simple merge
author	bors <bors@rust-lang.org>
	Tue, 26 Nov 2013 20:13:03 +0000 (12:13 -0800)
committer	bors <bors@rust-lang.org>
	Tue, 26 Nov 2013 20:13:03 +0000 (12:13 -0800)
		1	2
src/librustuv/addrinfo.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustuv/net.rs	patch \|	diff1 \|	diff2 \|	blob \| history