]> git.lizzy.rs Git - rust.git/commitdiff
automated merge
authorbors <bors@rust-lang.org>
Sat, 2 Feb 2013 01:13:42 +0000 (17:13 -0800)
committerbors <bors@rust-lang.org>
Sat, 2 Feb 2013 01:13:42 +0000 (17:13 -0800)

Trivial merge