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

Conflicts:
	conf/app.ini

modules/setting/setting.go

@@ -10,6 +10,7 @@ import (
 	"os/exec"
 	"path"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"time"
 
@@ -99,12 +100,14 @@ var (
 	CustomPath   string // Custom directory path.
 	ProdMode     bool
 	RunUser      string
+	IsWindows    bool
 
 	// I18n settings.
 	Langs, Names []string
 )
 
 func init() {
+	IsWindows = runtime.GOOS == "windows"
 	log.NewLogger(0, "console", `{"level": 0}`)
 }