From: Frank Karlitschek Date: Fri, 18 May 2012 16:25:31 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.0.0RC2~2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0df376d4721d015947b7e05b71fddd65791fad43;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 0df376d4721d015947b7e05b71fddd65791fad43