From: Robin Appelman Date: Wed, 9 Feb 2011 18:50:30 +0000 (+0100) Subject: Merge branch 'master' of git.kde.org:owncloud X-Git-Tag: v3.0~267^2~565 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=809db50459487d8bfda614eaa8a3ed25c9bedcc0;p=nextcloud-server.git Merge branch 'master' of git.kde.org:owncloud --- 809db50459487d8bfda614eaa8a3ed25c9bedcc0