Merge branch 'master' into master

skeleten · web-flow · commit 6edf535d9754 · 2016-06-29T02:09:02.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,4 @@
-[project]
+[package]
 name = "cargo"
 version = "0.12.0"
 authors = ["Yehuda Katz <wycats@gmail.com>",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-[project]`
	`1`	`+[package]`
`2`	`2`	`name = "cargo"`
`3`	`3`	`version = "0.12.0"`
`4`	`4`	`authors = ["Yehuda Katz <[email protected]>",`