Merge branch 'master' of localhost:xiaoxiao/gogs4

Conflicts:
	.gitignore

serve.go

@@ -13,6 +13,7 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/codegangsta/cli"
 	"github.com/gogits/gogs/modules/log"
@@ -205,6 +206,8 @@ func runServ(k *cli.Context) {
 		return
 	}
 
+	time.Sleep(time.Second)
+
 	// find push reference name
 	var t = "ok refs/heads/"
 	var i int