Alex Crichton ff1dd44b40 Merge remote-tracking branch 'origin/master' into 0.11.0-release ... Conflicts: src/libstd/lib.rs		2014-07-02 11:08:21 -07:00
..
io	Rename recvfrom -> recv_from, sendto -> send_to.	2014-07-02 08:21:42 +09:00
lib.rs	Merge remote-tracking branch 'origin/master' into 0.11.0-release	2014-07-02 11:08:21 -07:00
task.rs	auto merge of #15208 : alexcrichton/rust/snapshots, r=pcwalton	2014-06-28 20:11:34 +00:00