]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #30001 - Detegr:master, r=Manishearth
authorbors <bors@rust-lang.org>
Tue, 24 Nov 2015 01:42:31 +0000 (01:42 +0000)
committerbors <bors@rust-lang.org>
Tue, 24 Nov 2015 01:42:31 +0000 (01:42 +0000)
r? @Manishearth


Trivial merge