From: Michael Gapczynski Date: Sat, 27 Aug 2011 17:42:10 +0000 (-0400) Subject: Merge branch 'master' of git://anongit.kde.org/owncloud X-Git-Tag: v3.0~267^2~33 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b9565cb1744152c8c1f1c3fe4f5e96d7e71a80c4;p=nextcloud-server.git Merge branch 'master' of git://anongit.kde.org/owncloud --- b9565cb1744152c8c1f1c3fe4f5e96d7e71a80c4