From adb9791b7c0d7c44c2c14b2abcfcfc93ea351d08 Mon Sep 17 00:00:00 2001
From: Mikkel Krautz <mikkel@krautz.dk>
Date: Wed, 9 Nov 2011 12:52:12 +0100
Subject: [PATCH] gofix Go 1 pkg renames.

---
 ctl.go                       | 2 +-
 gencert.go                   | 2 +-
 grumble.go                   | 2 +-
 pkg/htmlfilter/htmlfilter.go | 2 +-
 register.go                  | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ctl.go b/ctl.go
index 4690fc3..a590b34 100644
--- a/ctl.go
+++ b/ctl.go
@@ -6,7 +6,7 @@ package main
 
 import (
 	"log"
-	"rpc"
+	"net/rpc"
 	"strconv"
 )
 
diff --git a/gencert.go b/gencert.go
index a26ae3b..43f8feb 100644
--- a/gencert.go
+++ b/gencert.go
@@ -5,13 +5,13 @@
 package main
 
 import (
-	"big"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"
 	"crypto/x509/pkix"
 	"encoding/pem"
 	"log"
+	"math/big"
 	"os"
 	"path/filepath"
 	"time"
diff --git a/grumble.go b/grumble.go
index 732a3ad..0a484f4 100644
--- a/grumble.go
+++ b/grumble.go
@@ -10,10 +10,10 @@ import (
 	"grumble/blobstore"
 	"log"
 	"net"
+	"net/rpc"
 	"os"
 	"path/filepath"
 	"regexp"
-	"rpc"
 )
 
 var servers map[int64]*Server
diff --git a/pkg/htmlfilter/htmlfilter.go b/pkg/htmlfilter/htmlfilter.go
index 899c8a3..62545d3 100644
--- a/pkg/htmlfilter/htmlfilter.go
+++ b/pkg/htmlfilter/htmlfilter.go
@@ -6,10 +6,10 @@ package htmlfilter
 
 import (
 	"bytes"
+	"encoding/xml"
 	"errors"
 	"io"
 	"strings"
-	"xml"
 )
 
 type Options struct {
diff --git a/register.go b/register.go
index 78813bf..20f7eb7 100644
--- a/register.go
+++ b/register.go
@@ -11,9 +11,9 @@ import (
 	"crypto/sha1"
 	"crypto/tls"
 	"encoding/hex"
-	"http"
+	"encoding/xml"
 	"io/ioutil"
-	"xml"
+	"net/http"
 )
 
 type Register struct {