Auto merge of #1921 - Gankro:doc, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 20 Aug 2015 03:08:10 +0000 (03:08 +0000)
committerbors <bors@rust-lang.org>
Thu, 20 Aug 2015 03:08:10 +0000 (03:08 +0000)

Trivial merge