From: Björn Schießle <schiessle@owncloud.com>
Date: Wed, 12 Jun 2013 18:53:45 +0000 (+0200)
Subject: Merge branch 'master' into files_encryption_upgrade_fix
X-Git-Tag: v6.0.0alpha2~642^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=27fcdb3af5d1b1012695a09e04c0a654a1dde710;p=nextcloud-server.git

Merge branch 'master' into files_encryption_upgrade_fix

Conflicts:
	apps/files_encryption/tests/crypt.php
---

27fcdb3af5d1b1012695a09e04c0a654a1dde710