From: Tom Needham Date: Mon, 4 Jun 2012 18:43:22 +0000 (+0000) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.5.0beta1~74^2~424^2~30^2~9 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cf85a1e2649eda241560e0e52cc37580cbca259f;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- cf85a1e2649eda241560e0e52cc37580cbca259f