From: Michael Gapczynski Date: Tue, 21 May 2013 15:26:56 +0000 (-0400) Subject: Merge branch 'master' into move-maint-start X-Git-Tag: v6.0.0alpha2~634^2~2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c62f230ddb4304faa9455e849b393693fc9b14aa;p=nextcloud-server.git Merge branch 'master' into move-maint-start --- c62f230ddb4304faa9455e849b393693fc9b14aa