From: Robin Appelman <icewind1991@gmail.com>
Date: Fri, 7 Oct 2011 14:46:18 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v3.0~101^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4fc8e28fba31b480b9265ded15ff2646646d0f88;p=nextcloud-server.git

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

4fc8e28fba31b480b9265ded15ff2646646d0f88