From: Björn Schießle <schiessle@owncloud.com>
Date: Tue, 21 May 2013 13:30:19 +0000 (+0200)
Subject: Merge branch 'master' into files_encryption
X-Git-Tag: v6.0.0alpha2~743^2~18
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5cd14425f9cc4ff122bd3c324ce9f3be80844e91;p=nextcloud-server.git

Merge branch 'master' into files_encryption

Conflicts:
	apps/files_trashbin/l10n/nn_NO.php
---

5cd14425f9cc4ff122bd3c324ce9f3be80844e91