From: FuXiaoHei <fuxiaohei@hexiaz.com>
Date: Mon, 24 Mar 2014 15:30:49 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v0.9.99~2353
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=67b43387f44b9e3a03f471d0782bfae34a9b9357;p=gitea.git

Merge remote-tracking branch 'origin/master'
---

67b43387f44b9e3a03f471d0782bfae34a9b9357