]> git.lizzy.rs Git - rust.git/commitdiff
Merge remote-tracking branch 'upstream/master' into doc-18498
authorSean Jensen-Grey <seanj@xyke.com>
Sun, 2 Nov 2014 04:07:19 +0000 (21:07 -0700)
committerSean Jensen-Grey <seanj@xyke.com>
Sun, 2 Nov 2014 04:07:19 +0000 (21:07 -0700)

Trivial merge