]> git.proxmox.com Git - cargo.git/commitdiff
auto merge of #317 : jdeseno/cargo/doc-manifest-path, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 4 Aug 2014 14:59:32 +0000 (14:59 +0000)
committerbors <bors@rust-lang.org>
Mon, 4 Aug 2014 14:59:32 +0000 (14:59 +0000)

Trivial merge