From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Mon, 14 Oct 2013 08:56:50 +0000 (+0200)
Subject: Merge branch 'master' into fixing-4546-master
X-Git-Tag: v6.0.0alpha2~11^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a5e808defc5a6afd38df429768d76c283305a4f2;p=nextcloud-server.git

Merge branch 'master' into fixing-4546-master

Conflicts:
	lib/private/connector/sabre/file.php
---

a5e808defc5a6afd38df429768d76c283305a4f2