killing zh_CN.GB2321
Merge branch 'master' into fixing-3421-master

Conflicts:
	l10n/zh_CN.GB2312/updater.po
Merge pull request #1345 from owncloud/fixing-3421-master

killing zh_CN.GB2321