From: codeskyblue <codeskyblue@gmail.com>
Date: Mon, 17 Aug 2015 06:34:01 +0000 (+0800)
Subject: Merge branch 'develop' of https://github.com/gogits/gogs into develop
X-Git-Tag: v0.9.99~1220^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d339ad2fedb7a14889b4685aaeed7fbbafd69af3;p=gitea.git

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

d339ad2fedb7a14889b4685aaeed7fbbafd69af3