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

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

90518e8d2a9adc1d93b1453a830b3703d54d72c2