Merge remote-tracking branch 'upstream/develop' into frontier/js

Conflicts:
	cmd/ethereum/js.go
	javascript/types.go

1 files changed, 9 insertions, 0 deletions

diff --git a/common/main_test.go b/common/main_test.go
new file mode 100644
index 000000000..2bed278e6
--- /dev/null
+++ b/common/main_test.go
@@ -0,0 +1,9 @@
+package common
+
+import (
+	"testing"
+
+	checker "gopkg.in/check.v1"
+)
+
+func Test(t *testing.T) { checker.TestingT(t) }