Auto merge of - brson:netbsd, r=alexcrichton

Depends on https://github.com/rust-lang/rust/pull/30015 since this branch includes `#[staged_api]` changes.
This commit is contained in:
bors 2015-11-27 01:48:12 +00:00
commit e5aa92a0df

@ -1 +1 @@
Subproject commit e6714f3c7032eeff38e0f5bba21e71c551efb97b
Subproject commit 867c6ff0b824d6d295951ed34bb252d5e0b2467a