From: Robin Appelman Date: Tue, 3 Aug 2010 15:40:50 +0000 (+0200) Subject: Merge branch 'master' of http://git.gitorious.org/owncloud/owncloud X-Git-Tag: v3.0~327 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9c56a1e6085865e626c930bfcfc4e32638414b26;p=nextcloud-server.git Merge branch 'master' of http://git.gitorious.org/owncloud/owncloud --- 9c56a1e6085865e626c930bfcfc4e32638414b26