]> git.lizzy.rs Git - rust.git/commitdiff
automated merge
authorbors <bors@rust-lang.org>
Mon, 4 Feb 2013 23:39:10 +0000 (15:39 -0800)
committerbors <bors@rust-lang.org>
Mon, 4 Feb 2013 23:39:10 +0000 (15:39 -0800)

Trivial merge