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