From: Nick Cameron <ncameron@mozilla.com>
Date: Wed, 13 May 2015 03:09:17 +0000 (+1200)
Subject: Merge branch 'master' into mulit-decor
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=103e52b1db92b9ac57dcebf5c5738ad5a45155ad;p=rust.git

Merge branch 'master' into mulit-decor
---

103e52b1db92b9ac57dcebf5c5738ad5a45155ad