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

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

7c7014262bdf90880826e6e6cc802bdab300b5ae