From: Frank Karlitschek Date: Tue, 1 May 2012 22:24:24 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.0.0beta~112 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c94f39b488f9ae6bd24cbdbb5cfa877e29f199e3;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- c94f39b488f9ae6bd24cbdbb5cfa877e29f199e3