From: FuXiaoHei <fuxiaohei@hexiaz.com>
Date: Mon, 17 Mar 2014 09:15:02 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v0.9.99~2422^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=df1985e1e8ff8a5173b3a80a6bcdaee13f6a0b1a;p=gitea.git

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

df1985e1e8ff8a5173b3a80a6bcdaee13f6a0b1a