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