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

.gopmfile

@@ -10,8 +10,8 @@ github.com/Unknwon/macaron = commit:635c89ac74
 github.com/Unknwon/paginater = commit:cab2d086fa
 github.com/codegangsta/cli = commit:2bcd11f863
 github.com/go-sql-driver/mysql = commit:a197e5d405
-github.com/go-xorm/core = 
-github.com/go-xorm/xorm = 
+github.com/go-xorm/core = commit:4813c0110d
+github.com/go-xorm/xorm = commit:97e7703766
 github.com/gogits/chardet = commit:2404f77725
 github.com/gogits/go-gogs-client = commit:92e76d616a
 github.com/lib/pq = commit:0dad96c0b9
@@ -24,7 +24,7 @@ github.com/macaron-contrib/oauth2 = commit:8f394c3629
 github.com/macaron-contrib/session = commit:e48134e803
 github.com/macaron-contrib/toolbox = commit:acbfe36e16
 github.com/mattn/go-sqlite3 = commit:e28cd440fa
-github.com/mcuadros/go-version = 
+github.com/mcuadros/go-version = commit:d52711f8d6
 github.com/microcosm-cc/bluemonday = commit:2b7763a06c
 github.com/mssola/user_agent = commit:f659b98638
 github.com/msteinert/pam = commit:9a42d39dbf