]> git.lizzy.rs Git - rust.git/commitdiff
rollup merge of #24670: brson/1.1
authorAlex Crichton <alex@alexcrichton.com>
Tue, 21 Apr 2015 22:23:17 +0000 (15:23 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Tue, 21 Apr 2015 22:23:17 +0000 (15:23 -0700)
We're not going to do another merge into beta, so what's on master is now destined for 1.1.

Also reset the prerelease number to ".1"


Trivial merge