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

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

d64a8e8d3aa5f1dc606860c0950a8b7dbebf944c