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

Merge branch 'master' of localhost:xiaoxiao/gogs5

Conflicts:
	.gitignore
---

9c27f8c228abe18a4dd6cd02363d315b2e361c27