From: lunnyxiao <xiaolunwen@gmail.com>
Date: Fri, 29 Aug 2014 03:25:03 +0000 (+0800)
Subject: Merge branch 'dev' of github.com:gogits/gogs into dev
X-Git-Tag: v0.9.99~1868
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a6ec6def8dde232cf250e95ef95b14950031771e;p=gitea.git

Merge branch 'dev' of github.com:gogits/gogs into dev
---

a6ec6def8dde232cf250e95ef95b14950031771e