Merge branch 'master' into develop

2014-08-23 19:01:15 +02:00 · 2014-08-23 19:01:15 +02:00 · 67af300383
commit 67af300383
parent fcc6f183a4 ccea5fa948
1 changed files with 3 additions and 1 deletions
--- a/natpmp.go
+++ b/natpmp.go
@ -1,9 +1,11 @@
 package eth

 import (
-	natpmp "code.google.com/p/go-nat-pmp"
+	//natpmp "code.google.com/p/go-nat-pmp"
 	"fmt"
 	"net"
+
+	natpmp "github.com/jackpal/go-nat-pmp"
 )

 // Adapt the NAT-PMP protocol to the NAT interface