From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 31 May 2013 14:35:51 +0000 (+0200)
Subject: Merge branch 'master' into user
X-Git-Tag: v6.0.0alpha2~688^2~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=542bcf915680fb9942057dc0c3c9f7b0eb59f3a5;p=nextcloud-server.git

Merge branch 'master' into user
---

542bcf915680fb9942057dc0c3c9f7b0eb59f3a5