Merge branch 'develop' of github.com:/ethereum/tests into develop

gavofyork · gavofyork · commit 4bb646117d00 · 2014-07-02T19:43:22.000+02:00
diff --git a/TODO b/TODO
@@ -1,4 +1,4 @@
-- Move over to standard & clear JSON format:
+- Move over to standard and clear JSON format:
 
 All files should be of the form:
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-- Move over to standard & clear JSON format:`
	`1`	`+- Move over to standard and clear JSON format:`
`2`	`2`
`3`	`3`	`All files should be of the form:`
`4`	`4`