Merge branch 'master' into develop

67af3003 · obscuren · fcc6f183 · ccea5fa9 · 67af3003
Commit 67af3003 authored Aug 23, 2014 by obscuren
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

natpmp.go natpmp.go +3 -1

No files found.
--- a/natpmp.go
+++ b/natpmp.go
 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