]> git.lizzy.rs Git - rust.git/commitdiff
automated merge
authorbors <bors@rust-lang.org>
Sun, 3 Feb 2013 00:08:40 +0000 (16:08 -0800)
committerbors <bors@rust-lang.org>
Sun, 3 Feb 2013 00:08:40 +0000 (16:08 -0800)

Trivial merge