From: fuxiaohei <fuxiaohei@vip.qq.com>
Date: Tue, 23 Sep 2014 15:36:25 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/dev' into dev
X-Git-Tag: v0.9.99~1785
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d750d53422df8d11783b672ac6cc558b136b5632;p=gitea.git

Merge remote-tracking branch 'origin/dev' into dev
---

d750d53422df8d11783b672ac6cc558b136b5632