]> git.lizzy.rs Git - rust.git/commit
Merge remote-tracking branch 'z0w0/cargo-deps'
authorBrian Anderson <banderson@mozilla.com>
Sun, 10 Jun 2012 00:26:02 +0000 (17:26 -0700)
committerBrian Anderson <banderson@mozilla.com>
Sun, 10 Jun 2012 00:26:02 +0000 (17:26 -0700)
commit106fe8b5e8f97e824c18694410c7b64c0afc6589
tree2d6172fbe1dec4cacb45d617f45cac167ff3a09e
parent748bd12dc787a486e102be5ae19b2b1fb3263c0c
parent67e62b388c7cd26bb76cf3ea467514951f648495
Merge remote-tracking branch 'z0w0/cargo-deps'

Conflicts:
src/cargo/cargo.rs
src/cargo/cargo.rs