From: Björn Schießle <schiessle@owncloud.com>
Date: Tue, 2 Jul 2013 11:54:31 +0000 (+0200)
Subject: Merge branch 'master' into encryption_check_php_version
X-Git-Tag: v6.0.0alpha2~524^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3fc5b34247cc30809ca525b96e73f1448e5b2e9b;p=nextcloud-server.git

Merge branch 'master' into encryption_check_php_version

Conflicts:
	apps/files_encryption/files/error.php
---

3fc5b34247cc30809ca525b96e73f1448e5b2e9b