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