From: Georg Ehrke Date: Tue, 27 Mar 2012 18:54:16 +0000 (+0200) Subject: Merge branch 'master' into sabredav_1.6 X-Git-Tag: v4.0.0beta~201^2~9 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=536a3ecb428b9450a188de4a0fcca2f9be6318f3;p=nextcloud-server.git Merge branch 'master' into sabredav_1.6 --- 536a3ecb428b9450a188de4a0fcca2f9be6318f3