From: Robin Appelman Date: Wed, 5 Oct 2011 00:11:44 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v3.0~100^2^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a8621265e27daefc4bd76fdf446e65648db4387d;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- a8621265e27daefc4bd76fdf446e65648db4387d