From: Georg Ehrke Date: Sun, 15 Apr 2012 20:28:11 +0000 (+0200) Subject: Merge branch 'master' into sabredav_1.6 X-Git-Tag: v4.0.0beta~201^2~4 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=77cefdedb86de65e69f470c8b6a1b03bb001966e;p=nextcloud-server.git Merge branch 'master' into sabredav_1.6 --- 77cefdedb86de65e69f470c8b6a1b03bb001966e