]> git.lizzy.rs Git - rust.git/commitdiff
Merge remote-tracking branch 'mozilla/incoming'
authorBrian Anderson <banderson@mozilla.com>
Sun, 24 Jun 2012 20:31:46 +0000 (13:31 -0700)
committerBrian Anderson <banderson@mozilla.com>
Sun, 24 Jun 2012 20:31:46 +0000 (13:31 -0700)

Trivial merge