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

author Lunny Xiao <xiaolunwen@gmail.com>

Thu, 10 Apr 2014 14:22:18 +0000 (22:22 +0800)

committer Lunny Xiao <xiaolunwen@gmail.com>

Thu, 10 Apr 2014 14:22:18 +0000 (22:22 +0800)
author Lunny Xiao <xiaolunwen@gmail.com>
Thu, 10 Apr 2014 14:22:18 +0000 (22:22 +0800)
committer Lunny Xiao <xiaolunwen@gmail.com>
Thu, 10 Apr 2014 14:22:18 +0000 (22:22 +0800)
diff --cc routers/repo/repo.go
Simple merge
diff --cc web.go
Simple merge
author	Lunny Xiao <xiaolunwen@gmail.com>
	Thu, 10 Apr 2014 14:22:18 +0000 (22:22 +0800)
committer	Lunny Xiao <xiaolunwen@gmail.com>
	Thu, 10 Apr 2014 14:22:18 +0000 (22:22 +0800)
		1	2
routers/repo/repo.go	patch \|	diff1 \|	diff2 \|	blob \| history
web.go	patch \|	diff1 \|	diff2 \|	blob \| history