]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #26821 - oli-obk:patch-1, r=sanxiyn
authorbors <bors@rust-lang.org>
Mon, 6 Jul 2015 12:20:23 +0000 (12:20 +0000)
committerbors <bors@rust-lang.org>
Mon, 6 Jul 2015 12:20:23 +0000 (12:20 +0000)

Trivial merge