From: Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>
Date: Thu, 28 Jul 2011 20:20:34 +0000 (+0200)
Subject: Merge branch 'master' into interface
X-Git-Tag: v3.0~267^2~364^2~21^2~18
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ba246d3b27ca7a5de06e5674e9b562035d36eca0;p=nextcloud-server.git

Merge branch 'master' into interface
---

ba246d3b27ca7a5de06e5674e9b562035d36eca0