From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 22 Apr 2014 10:25:49 +0000 (+0200)
Subject: merge master into webdav-injection
X-Git-Tag: v7.0.0alpha2~357^2~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3821a0968950c7320ed9bfa60a5c347060eaff0a;p=nextcloud-server.git

merge master into webdav-injection
---

3821a0968950c7320ed9bfa60a5c347060eaff0a