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

diff --cc routers/user/user.go
index 0d9f67e49715af1bbf5aef902e994d4d356d1e74,39dfa462b85b4df3073bf2b626cac519267c4cdd..253ab7be0020a87598c71ec0779f8e73306c6032
--- 1/routers/user/user.go
--- 2/routers/user/user.go
+++ b/routers/user/user.go
@@@ -101,9 -98,9 +101,9 @@@ func SignIn(ctx *middleware.Context) 
                }
        }()
  
 -      user, err := models.GetUserByName(userName)
 +      user, err = models.GetUserByName(userName)
        if err != nil {
-               ctx.HTML(200, "user/signin")
+               ctx.HTML(500, "user/signin")
                return
        }