From: Florin Peter <github@florin-peter.de>
Date: Fri, 31 May 2013 10:58:12 +0000 (+0200)
Subject: Merge branch 'master' into files_encryption_upgrade_fix
X-Git-Tag: v6.0.0alpha2~642^2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1bfe975938e96f462afe5ef5e5ebc75735767711;p=nextcloud-server.git

Merge branch 'master' into files_encryption_upgrade_fix

Conflicts:
	apps/files_encryption/lib/util.php
---

1bfe975938e96f462afe5ef5e5ebc75735767711