]> git.lizzy.rs Git - rust.git/commitdiff
Merge remote-tracking branch 'brson/futures'
authorBrian Anderson <banderson@mozilla.com>
Thu, 25 Oct 2012 03:29:01 +0000 (20:29 -0700)
committerBrian Anderson <banderson@mozilla.com>
Thu, 25 Oct 2012 03:29:01 +0000 (20:29 -0700)

Trivial merge