From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 16 Jul 2013 13:22:47 +0000 (+0200)
Subject: Merge branch 'master' into cache
X-Git-Tag: v6.0.0alpha2~452^2~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0ae8eb4f5e05d9e3c5a22a7278ee104edd95fdf4;p=nextcloud-server.git

Merge branch 'master' into cache
---

0ae8eb4f5e05d9e3c5a22a7278ee104edd95fdf4