From: Robin Appelman <icewind1991@gmail.com>
Date: Mon, 5 Jul 2010 09:44:33 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v3.0~351^2~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=845d53414482686548ab2435d738b0b3afcd47c3;p=nextcloud-server.git

Merge branch 'master' of gitorious.org:owncloud/owncloud
---

845d53414482686548ab2435d738b0b3afcd47c3