]> git.lizzy.rs Git - rust.git/commitdiff
Merge commit '74ae05ad90d1e809663702f374bba6e62671692c' into rollup
authorAlex Crichton <alex@alexcrichton.com>
Wed, 6 Aug 2014 18:25:22 +0000 (11:25 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 6 Aug 2014 18:25:22 +0000 (11:25 -0700)

Trivial merge