From: Robin Appelman Date: Thu, 6 Oct 2011 22:15:54 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v3.0~101^2~2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=20554be9f4b311af0f239c5d9ad2fcf7c5156bbd;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 20554be9f4b311af0f239c5d9ad2fcf7c5156bbd