From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 16 Feb 2012 08:42:30 +0000 (+0100)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v4.0.0beta~71^2~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=19827b8b35de6192d54bf7600e9e29800c93b21b;p=nextcloud-server.git

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

19827b8b35de6192d54bf7600e9e29800c93b21b