]> git.proxmox.com Git - cargo.git/commitdiff
auto merge of #827 : DiamondLovesYou/cargo/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 11 Nov 2014 22:29:36 +0000 (22:29 +0000)
committerbors <bors@rust-lang.org>
Tue, 11 Nov 2014 22:29:36 +0000 (22:29 +0000)

Trivial merge