From: Jakob Sack Date: Wed, 10 Aug 2011 20:28:18 +0000 (+0200) Subject: Merge branch 'master' of git://anongit.kde.org/owncloud X-Git-Tag: v3.0~267^2~203 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b54d790a873290e71654e94ac5072e87e6ba5427;p=nextcloud-server.git Merge branch 'master' of git://anongit.kde.org/owncloud --- b54d790a873290e71654e94ac5072e87e6ba5427