From: Frank Karlitschek Date: Tue, 14 Feb 2012 15:34:33 +0000 (+0100) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.0.0beta~71^2~5^2~4 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=127c0c7033f2d215cd9759d71154084d91d22744;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 127c0c7033f2d215cd9759d71154084d91d22744