From: Jakob Sack Date: Mon, 20 Jun 2011 20:09:21 +0000 (+0200) Subject: Merge branch 'master' of git://anongit.kde.org/owncloud X-Git-Tag: v3.0~267^2~481 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3e74cca7398e21f6c46b9815e9fc0d46a5462cdb;p=nextcloud-server.git Merge branch 'master' of git://anongit.kde.org/owncloud --- 3e74cca7398e21f6c46b9815e9fc0d46a5462cdb