]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #19132 : sinistersnare/rust/patch-1, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 22 Nov 2014 12:46:37 +0000 (12:46 +0000)
committerbors <bors@rust-lang.org>
Sat, 22 Nov 2014 12:46:37 +0000 (12:46 +0000)
Just used Githubs edit view, so I hope this works...


Trivial merge