From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 11 Oct 2013 15:00:21 +0000 (+0200)
Subject: Merge branch 'master' into versioning_preview_shared
X-Git-Tag: v6.0.0alpha2~23^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c32c5979d8bfda4503bb41cf6efd94aa81d1e94f;p=nextcloud-server.git

Merge branch 'master' into versioning_preview_shared
---

c32c5979d8bfda4503bb41cf6efd94aa81d1e94f