From: Tom Needham <needham.thomas@gmail.com>
Date: Sat, 7 Apr 2012 17:31:30 +0000 (+0000)
Subject: Merge branch 'master' into migration
X-Git-Tag: v4.0.0beta~381
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9edf45a324c2f1d4532d02e5c8fa37ebfa0c9dab;p=nextcloud-server.git

Merge branch 'master' into migration
---

9edf45a324c2f1d4532d02e5c8fa37ebfa0c9dab