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