From: Georg Ehrke Date: Sun, 25 Mar 2012 12:02:40 +0000 (+0200) Subject: Merge branch 'master' into sabredav_1.6 X-Git-Tag: v4.0.0beta~201^2~10 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ac0c5ba6daf5ffe84088571ea307f5223bd1049a;p=nextcloud-server.git Merge branch 'master' into sabredav_1.6 --- ac0c5ba6daf5ffe84088571ea307f5223bd1049a