From: Georg Ehrke Date: Thu, 12 Jan 2012 20:43:32 +0000 (+0100) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v3.0~60^2~9 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a1429085ee7c061740ccb420b79104229eeb3a25;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- a1429085ee7c061740ccb420b79104229eeb3a25