From: Morris Jobke <morris.jobke@gmail.com>
Date: Tue, 27 Aug 2013 09:00:48 +0000 (-0700)
Subject: Merge pull request #4586 from owncloud/fixing-3431-master
X-Git-Tag: v6.0.0alpha2~269
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ea446544ef7a4e5e2d07dba936b5454576aaa1d1;p=nextcloud-server.git

Merge pull request #4586 from owncloud/fixing-3431-master

kill zh_CN.GB2312
---

ea446544ef7a4e5e2d07dba936b5454576aaa1d1