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

2014-07-02 19:43:22 +02:00
commit 4bb646117d
@@ -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:
`@@ -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:`	`All files should be of the form:`