]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #11914 : FlaPer87/rust/issue-6157, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 30 Jan 2014 15:06:27 +0000 (07:06 -0800)
committerbors <bors@rust-lang.org>
Thu, 30 Jan 2014 15:06:27 +0000 (07:06 -0800)
closes #6157


Trivial merge