From: Thomas Mueller Date: Tue, 19 Mar 2013 13:43:55 +0000 (+0100) Subject: Merge branch 'master' into fixing-windows-datadir-master X-Git-Tag: v6.0.0alpha2~1033^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9dd3dcc5cda3b99fda45dc4ae4721afabaef9695;p=nextcloud-server.git Merge branch 'master' into fixing-windows-datadir-master --- 9dd3dcc5cda3b99fda45dc4ae4721afabaef9695