From: Frank Karlitschek Date: Mon, 4 Jun 2012 10:46:22 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.5.0beta1~74^2~424^2~41 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8755fd88bbcf0468f7ccd35054a07b35133bde13;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 8755fd88bbcf0468f7ccd35054a07b35133bde13