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

Conflicts:
	conf/app.ini

diff --cc conf/app.ini
index 30d6c7d4832eed01d2b0eb094ea0b7a162552fcd,6b3ce8d24063614745d252af2afad60ae17f4f5c..ec5fcb23b3492fc71c70b47d98991397039e2749
--- 1/conf/app.ini
--- 2/conf/app.ini
+++ b/conf/app.ini
@@@ -75,25 -75,28 +75,25 @@@ HOST 
  [session]
  ; Either "memory", "file", "redis" or "mysql", default is "memory"
  PROVIDER = file
 -; provider config
 +; Provider config options
  ; memory: not have any config yet
 -; file: session file path
 -; e.g. tmp/sessions
 -; redis: config like redis server addr,poolSize,password
 -; e.g. 127.0.0.1:6379,100,astaxie
 -; mysql: go-sql-driver/mysql dsn config string
 -; e.g. root:password@/session_table
 +; file: session file path, e.g. data/sessions
 +; redis: config like redis server addr, poolSize, password, e.g. 127.0.0.1:6379,100,astaxie
 +; mysql: go-sql-driver/mysql dsn config string, e.g. root:password@/session_table
  PROVIDER_CONFIG = data/sessions
 -; session cookie name
 +; Session cookie name
  COOKIE_NAME = i_like_gogits
 -; if you use session in https only, default is false
 +; If you use session in https only, default is false
  COOKIE_SECURE = false
 -; enable set cookie, default is true
 +; Enable set cookie, default is true
  ENABLE_SET_COOKIE = true
 -; session gc time interval, default is 86400
 +; Session GC time interval, default is 86400
  GC_INTERVAL_TIME = 86400
 -; session life time, default is 86400
 +; Session life time, default is 86400
  SESSION_LIFE_TIME = 86400
- ; Session id hash func, default is sha1
+ ; session id hash func, Either "sha1", "sha256" or "md5" default is sha1
  SESSION_ID_HASHFUNC = sha1
 -; session hash key, default is use random string
 +; Session hash key, default is use random string
  SESSION_ID_HASHKEY =
  
  [picture]