Merge branch 'master' into fix-droid

api/license.go

@@ -5,7 +5,7 @@ package api
 
 import (
 	"bytes"
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/utils"