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