From: Michael Gapczynski Date: Thu, 25 Aug 2011 21:22:25 +0000 (-0400) Subject: Merge branch 'master' of git://anongit.kde.org/owncloud X-Git-Tag: v3.0~267^2~37 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fbf9d62742e63682687aa8cf59e97596f36733df;p=nextcloud-server.git Merge branch 'master' of git://anongit.kde.org/owncloud --- fbf9d62742e63682687aa8cf59e97596f36733df