From: Marvin Thomas Rabe Date: Tue, 4 Oct 2011 17:37:54 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v3.0~115^2~1 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=340f6bbaba62af6079cfa9485e458d2917bbe5e8;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 340f6bbaba62af6079cfa9485e458d2917bbe5e8