Merge remote-tracking branch 'origin/master'

Conflicts:
	routers/repo/single.go
	templates/repo/single.tmpl

diff --cc web.go
index 62395cf0bde91e7a6f039b5f51069d9a359eeb74,f108b1cf728ec21c4e87216a4f2d1bf7fefb3520..8e5bbaef0f52e7186e9c4a8a001383053e09b91e
--- 1/web.go
--- 2/web.go
+++ b/web.go
@@@ -74,10 -74,10 +74,12 @@@ func runWeb(*cli.Context) 
        m.Any("/repo/create", auth.SignInRequire(true), binding.BindIgnErr(auth.CreateRepoForm{}), repo.Create)
        m.Any("/repo/delete", auth.SignInRequire(true), repo.Delete)
        m.Any("/repo/list", auth.SignInRequire(false), repo.List)
 -      m.Get("/:username/:reponame", auth.SignInRequire(false), repo.Single)
 +      m.Get("/:username/:reponame", auth.SignInRequire(false), auth.RepoAssignment(true), repo.Single)
 +
 +      //m.Get("/:username/:reponame", repo.Repo)
  
+       //m.Get("/:username/:reponame", repo.Repo)
+ 
        listenAddr := fmt.Sprintf("%s:%s",
                base.Cfg.MustValue("server", "HTTP_ADDR"),
                base.Cfg.MustValue("server", "HTTP_PORT", "3000"))