]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #25024 - nrc:mulit-decor, r=sfackler
authorbors <bors@rust-lang.org>
Wed, 13 May 2015 08:31:17 +0000 (08:31 +0000)
committerbors <bors@rust-lang.org>
Wed, 13 May 2015 08:31:17 +0000 (08:31 +0000)

Trivial merge