From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 2 Feb 2012 16:30:54 +0000 (+0100)
Subject: Merge branch 'master' into filesystem
X-Git-Tag: v4.0.0beta~244^2~88^2~1^2~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7b9fb84fe9aa15c95bc6010e504761b6c737baa2;p=nextcloud-server.git

Merge branch 'master' into filesystem
---

7b9fb84fe9aa15c95bc6010e504761b6c737baa2