From: Georg Ehrke Date: Wed, 21 Mar 2012 08:42:53 +0000 (+0100) Subject: Merge branch 'master' into sabredav_1.6 X-Git-Tag: v4.0.0beta~201^2~12 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8f8d486f35c8f1d290e3db2ba7ae42dcb380d1dd;p=nextcloud-server.git Merge branch 'master' into sabredav_1.6 --- 8f8d486f35c8f1d290e3db2ba7ae42dcb380d1dd