]> git.lizzy.rs Git - rust.git/commitdiff
Merge 'richo/unquote-crates' into less-quotes
authorAlex Crichton <alex@alexcrichton.com>
Fri, 27 Mar 2015 18:06:41 +0000 (11:06 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Fri, 27 Mar 2015 18:06:48 +0000 (11:06 -0700)
Conflicts:
src/libsyntax/parse/parser.rs


Trivial merge