Merge from 47:c763113fe5c7

api.go

@@ -6,8 +6,8 @@ import (
 	"errors"
 	"fmt"
 	"github.com/gorilla/mux"
-	"labix.org/v2/mgo"
+	"gopkg.in/mgo.v2"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"net/http"
 	"net/url"
 	"strconv"

main.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 	"github.com/gorilla/mux"
+	goyaml "gopkg.in/yaml.v2"
 	"io/ioutil"
-	"launchpad.net/goyaml"
 	"log"
 	"net/http"
 	"path"

shared/mongo.go

@@ -3,7 +3,7 @@ package shared
 import (
 	"errors"
 	"fmt"
-	"labix.org/v2/mgo"
+	"gopkg.in/mgo.v2"
 	"net/url"
 	"strings"
 )