From: Frank Karlitschek Date: Wed, 28 Sep 2011 09:52:13 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v3.0~101^2~63^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=475dd72ea480aa9ac1ad57ef11ff23c91659a857;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 475dd72ea480aa9ac1ad57ef11ff23c91659a857