Merge branch 'master' of https://github.com/carlhuda/cargo
authorYehuda Katz <wycats@gmail.com>
Fri, 2 May 2014 00:06:39 +0000 (17:06 -0700)
committerYehuda Katz <wycats@gmail.com>
Fri, 2 May 2014 00:06:39 +0000 (17:06 -0700)

Trivial merge