From: Frank Karlitschek Date: Tue, 24 Apr 2012 13:38:36 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.0.0beta~210 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a3d0a74d03fadf577031d4c6bd7ce8cd7e2c0a95;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- a3d0a74d03fadf577031d4c6bd7ce8cd7e2c0a95