From: FuXiaoHei <fuxiaohei@hexiaz.com>
Date: Thu, 13 Mar 2014 04:16:51 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v0.9.99~2463
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=555c8f1d919eae951bf7f75f4bc6a150ec04b9a6;p=gitea.git

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

555c8f1d919eae951bf7f75f4bc6a150ec04b9a6