Auto merge of #1940 - steveklabnik:whoops, r=huonw
authorbors <bors@rust-lang.org>
Tue, 25 Aug 2015 23:18:58 +0000 (23:18 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Aug 2015 23:18:58 +0000 (23:18 +0000)
Thanks @huonw :sob:


Trivial merge