From: codeskyblue <codeskyblue@gmail.com>
Date: Sun, 28 Sep 2014 08:38:19 +0000 (+0800)
Subject: Merge branch 'master' into dev
X-Git-Tag: v0.9.99~1753^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=26a0888beea576badc81a947800670249fab94df;p=gitea.git

Merge branch 'master' into dev
---

26a0888beea576badc81a947800670249fab94df