From: Robin Appelman <icewind1991@gmail.com>
Date: Sat, 26 Feb 2011 14:50:34 +0000 (+0100)
Subject: Merge branch 'master' of git.kde.org:owncloud
X-Git-Tag: v3.0~267^2~564
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b98cd2d870317acd9c3a8eadec0d31c1e0c311e7;p=nextcloud-server.git

Merge branch 'master' of git.kde.org:owncloud
---

b98cd2d870317acd9c3a8eadec0d31c1e0c311e7