From: Jakob Sack Date: Tue, 2 Aug 2011 16:49:35 +0000 (+0200) Subject: Merge branch 'master' of git://anongit.kde.org/owncloud X-Git-Tag: v3.0~267^2~305 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7d49e8285cfc059f9ad2efa26b7b923d1d846dfe;p=nextcloud-server.git Merge branch 'master' of git://anongit.kde.org/owncloud --- 7d49e8285cfc059f9ad2efa26b7b923d1d846dfe