From: Côme BERNIGAUD Date: Sat, 27 Aug 2011 16:11:32 +0000 (+0200) Subject: Merge branch 'master' of git.kde.org:owncloud X-Git-Tag: v3.0~267^2~33^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=52ca447efc022c48b257064fe446be307169adf0;p=nextcloud-server.git Merge branch 'master' of git.kde.org:owncloud --- 52ca447efc022c48b257064fe446be307169adf0