]> git.lizzy.rs Git - rust.git/commitdiff
projects / rust.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0f028d b5c6c7e)
Auto merge of #25818 - sfackler:socket-timeouts, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 30 May 2015 04:20:20 +0000 (04:20 +0000)
committerbors <bors@rust-lang.org>
Sat, 30 May 2015 04:20:20 +0000 (04:20 +0000)
Closes #25619

r? @alexcrichton


Trivial merge
Empowering everyone to build reliable and efficient software.