]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #31042 - shahn:weak_annotations, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 21 Jan 2016 07:13:16 +0000 (07:13 +0000)
committerbors <bors@rust-lang.org>
Thu, 21 Jan 2016 07:13:16 +0000 (07:13 +0000)
This was accidentally introduced in
7e2ffc7090a70fe8c77a0e03fcec3cb1387141f2.


Trivial merge