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