Merge branch 'master' into develop

This commit is contained in:
obscuren 2014-08-23 19:01:15 +02:00
commit 67af300383

View File

@ -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