From: Unknown <joe2010xtmf@163.com>
Date: Mon, 24 Mar 2014 16:45:57 +0000 (-0400)
Subject: Merge branch 'master' of github.com:gogits/gogs
X-Git-Tag: v0.9.99~2347
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6ef3e8b3c9a085e3d99b02ba7bb80fc8126f2f90;p=gitea.git

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

Conflicts:
	templates/repo/single_file.tmpl
---

6ef3e8b3c9a085e3d99b02ba7bb80fc8126f2f90