]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #23979 - Ryman:error_from_string, r=alexcrichton
authorManish Goregaokar <manishsmail@gmail.com>
Sat, 4 Apr 2015 05:23:22 +0000 (10:53 +0530)
committerManish Goregaokar <manishsmail@gmail.com>
Sat, 4 Apr 2015 05:23:22 +0000 (10:53 +0530)

Trivial merge