Merge branch 'master' of github.com:gogits/gogs

diff --cc gogs.go
index 08421f0055e2e465c29c128835f3aff6abd641aa,3b33c4e3039c6feb395e7ded7a650f54a9e86fa6..315297b101a4dd287947bce8423afcf55185500d
--- 1/gogs.go
--- 2/gogs.go
+++ b/gogs.go
@@@ -49,7 -49,10 +49,8 @@@ func main() 
        app.Commands = []cli.Command{
                CmdWeb,
                CmdServ,
+               CmdUpdate,
        }
 -      app.Flags = append(app.Flags, []cli.Flag{
 -              cli.BoolFlag{"noterm", "disable color output"},
 -      }...)
 +      app.Flags = append(app.Flags, []cli.Flag{}...)
        app.Run(os.Args)
  }

diff --cc serve.go
Simple merge