From: Jakob Sack Date: Sun, 19 Jun 2011 14:06:52 +0000 (+0200) Subject: Merge branch 'master' of git://anongit.kde.org/owncloud X-Git-Tag: v3.0~267^2~510 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=86406c6cfe7433f1d96870587196f33d16f7aae8;p=nextcloud-server.git Merge branch 'master' of git://anongit.kde.org/owncloud --- 86406c6cfe7433f1d96870587196f33d16f7aae8