From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 13 May 2012 19:42:00 +0000 (+0000)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v4.0.0RC2~89
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=82d3fe2e1c740d2ddc1bcb0aa8ce59d058c1e7f5;p=nextcloud-server.git

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

82d3fe2e1c740d2ddc1bcb0aa8ce59d058c1e7f5