From: Unknown <joe2010xtmf@163.com>
Date: Thu, 24 Apr 2014 20:20:27 +0000 (-0600)
Subject: Merge branch 'dev' of github.com:gogits/gogs into dev
X-Git-Tag: v0.9.99~2180
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5898d562055085d62da8129442b01cd71443163a;p=gitea.git

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

5898d562055085d62da8129442b01cd71443163a