From: Georg Ehrke Date: Mon, 19 Mar 2012 08:14:15 +0000 (+0100) Subject: Merge branch 'master' into sabredav_1.6 X-Git-Tag: v4.0.0beta~201^2~13 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9848bc33e5b78aaf2fa07554fdd3c78d34ec0b67;p=nextcloud-server.git Merge branch 'master' into sabredav_1.6 --- 9848bc33e5b78aaf2fa07554fdd3c78d34ec0b67