From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Thu, 13 Mar 2014 03:57:58 +0000 (+0800)
Subject: merge
X-Git-Tag: v0.9.99~2463^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9b845c11150102894a8bb453d86a335a7c2a64b8;p=gitea.git

merge
---

9b845c11150102894a8bb453d86a335a7c2a64b8