Merge branch 'develop' of github.com:gogits/gogs into develop

unknwon · unknwon · commit eac91a74d87f · 2015-10-21T06:40:56.000-04:00
diff --git a/.gopmfile b/.gopmfile
@@ -24,6 +24,8 @@ github.com/go-macaron/i18n =
 github.com/go-macaron/session = 
 github.com/go-macaron/toolbox = 
 github.com/klauspost/compress = 
+github.com/klauspost/crc32 = 
+github.com/klauspost/cpuid = 
 github.com/mattn/go-sqlite3 = commit:b808f01f66
 github.com/mcuadros/go-version = commit:d52711f8d6
 github.com/microcosm-cc/bluemonday = commit:85ba47ef2c
diff --git a/modules/setting/setting_memcache.go b/modules/setting/setting_memcache.go
@@ -7,7 +7,7 @@
 package setting
 
 import (
-	_ "github.com/macaron-contrib/cache/memcache"
+	_ "github.com/go-macaron/cache/memcache"
 )
 
 func init() {
diff --git a/modules/setting/setting_redis.go b/modules/setting/setting_redis.go
@@ -7,8 +7,8 @@
 package setting
 
 import (
-	_ "github.com/macaron-contrib/cache/redis"
-	_ "github.com/macaron-contrib/session/redis"
+	_ "github.com/go-macaron/cache/redis"
+	_ "github.com/go-macaron/session/redis"
 )
 
 func init() {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`package setting`
`8`	`8`
`9`	`9`	`import (`
`10`		`- _ "github.com/macaron-contrib/cache/memcache"`
	`10`	`+ _ "github.com/go-macaron/cache/memcache"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`package setting`
`8`	`8`
`9`	`9`	`import (`
`10`		`- _ "github.com/macaron-contrib/cache/redis"`
`11`		`- _ "github.com/macaron-contrib/session/redis"`
	`10`	`+ _ "github.com/go-macaron/cache/redis"`
	`11`	`+ _ "github.com/go-macaron/session/redis"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func init() {`