Auto merge of #1896 - achanda:tidy, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 12 Aug 2015 18:56:05 +0000 (18:56 +0000)
committerbors <bors@rust-lang.org>
Wed, 12 Aug 2015 18:56:05 +0000 (18:56 +0000)

Trivial merge