From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Tue, 25 Mar 2014 09:19:02 +0000 (+0800)
Subject: Merge branch 'master' of localhost:xiaoxiao/gogs3
X-Git-Tag: v0.9.99~2344
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fcbe7ef5c171c76b2966511a5aae2d4287548c58;p=gitea.git

Merge branch 'master' of localhost:xiaoxiao/gogs3

Conflicts:
	.gitignore
	LICENSE
---

fcbe7ef5c171c76b2966511a5aae2d4287548c58