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

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

1 files changed, 0 insertions, 19 deletions

diff --git a/ethutil/script_unix.go b/ethutil/script_unix.go
deleted file mode 100644
index 9250dda57..000000000
--- a/ethutil/script_unix.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// +build !windows
-
-package ethutil
-
-import "github.com/ethereum/serpent-go"
-
-// General compile function
-func Compile(script string, silent bool) (ret []byte, err error) {
-	if len(script) > 2 {
-		byteCode, err := serpent.Compile(script)
-		if err != nil {
-			return nil, err
-		}
-
-		return byteCode, nil
-	}
-
-	return nil, nil
-}