From: Florian Hülsmann Date: Mon, 2 Apr 2012 15:13:21 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:~cbix/owncloud/cbix-owncloud X-Git-Tag: v4.0.0beta~381^2~20 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2cb741adff905f0a53c950fc654d92d60958e4f5;p=nextcloud-server.git Merge branch 'master' of gitorious.org:~cbix/owncloud/cbix-owncloud --- 2cb741adff905f0a53c950fc654d92d60958e4f5