From: Unknwon <joe2010xtmf@163.com>
Date: Sat, 17 Jan 2015 07:29:45 +0000 (+0800)
Subject: Merge branch 'encoding' of github.com:gogits/gogs into dev
X-Git-Tag: v0.9.99~1540
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=452cca35e0d1126fa31adc2f89165e64d8cf7afe;p=gitea.git

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

Conflicts:
	.gopmfile
---

452cca35e0d1126fa31adc2f89165e64d8cf7afe
diff --cc .gopmfile
index 36a1b0d8e0,dd262cbb5f..b229a135f0
--- a/.gopmfile
+++ b/.gopmfile
@@@ -3,31 -3,31 +3,32 @@@ path = github.com/gogits/gog
  
  [deps]
  github.com/beego/memcache = commit:2aea774416
 -github.com/beego/redigo = commit:856744a0d5
  github.com/Unknwon/cae = commit:2e70a1351b
 -github.com/Unknwon/com = 
 -github.com/Unknwon/goconfig = commit:0f8d8dc1c0
 -github.com/Unknwon/i18n = commit:aec5f77857
 -github.com/Unknwon/macaron = commit:3d307c1232
 -github.com/codegangsta/cli = commit:7381bc4e62
 -github.com/go-sql-driver/mysql = commit:8111ee3ec3
 -github.com/go-xorm/core = commit:3e0fa232ab
 -github.com/go-xorm/xorm = commit:58d33844ce
 +github.com/Unknwon/com = commit:d9bcf409c8
 +github.com/Unknwon/i18n = commit:1e88666229
 +github.com/Unknwon/macaron = commit:256ba0beab
 +github.com/codegangsta/cli = commit:a14c5b47c7
 +github.com/go-sql-driver/mysql = commit:04cf947760
 +github.com/go-xorm/core = commit:e7882d8b00
 +github.com/go-xorm/xorm = commit:dcc529b68a
+ github.com/gogits/chardet = commit:2404f77725
  github.com/gogits/go-gogs-client = commit:92e76d616a
 -github.com/gogits/oauth2 = commit:99cbec870a
 -github.com/lib/pq = commit:b021d0ef20
 -github.com/macaron-contrib/binding = 
 -github.com/macaron-contrib/cache = commit:0bb9e6c9ef
 +github.com/lib/pq = commit:3e3efe51a0
 +github.com/macaron-contrib/binding = commit:0fbe4b9707
 +github.com/macaron-contrib/cache = commit:1d99a5b621
  github.com/macaron-contrib/captcha = commit:3567dc48b8
 -github.com/macaron-contrib/csrf = commit:422b79675c
 -github.com/macaron-contrib/i18n = commit:184bb832f2
 +github.com/macaron-contrib/csrf = commit:3ea14e7ee7
 +github.com/macaron-contrib/i18n = commit:0ee0539c84
  github.com/macaron-contrib/oauth2 = commit:8f394c3629
 -github.com/macaron-contrib/session = commit:f00d48fd4f
 +github.com/macaron-contrib/session = commit:2633cef14f
  github.com/macaron-contrib/toolbox = commit:57127bcc89
  github.com/mattn/go-sqlite3 = commit:a80c27ba33
 -github.com/nfnt/resize = commit:581d15cb53
 +github.com/nfnt/resize = commit:8f44931448
  github.com/russross/blackfriday = commit:05b8cefd6a
 +github.com/shurcooL/go = commit:48293cbc7a
 +github.com/saintfish/chardet = commit:3af4cd4741
 +gopkg.in/ini.v1 = commit:28ad8c408b
 +gopkg.in/redis.v2 = commit:e617904962
  
  [res]
  include = conf|etc|public|scripts|templates