]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #6276 : brson/rust/issue-6122, r=graydon
authorbors <bors@rust-lang.org>
Tue, 7 May 2013 13:06:42 +0000 (06:06 -0700)
committerbors <bors@rust-lang.org>
Tue, 7 May 2013 13:06:42 +0000 (06:06 -0700)
1  2 
src/libstd/ebml.rs

Simple merge