From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 27 Jul 2010 22:12:15 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v3.0~333
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dcb2455b69dc5b74d393b01c38eeb258701a5a91;p=nextcloud-server.git

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

dcb2455b69dc5b74d393b01c38eeb258701a5a91