From: Robin Appelman <icewind1991@gmail.com>
Date: Thu, 21 Jul 2011 22:28:17 +0000 (+0200)
Subject: Merge branch 'master' into interface
X-Git-Tag: v3.0~267^2~364^2~21^2~41
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9950f06c5925d3ae30916a50e0433104fcec4693;p=nextcloud-server.git

Merge branch 'master' into interface
---

9950f06c5925d3ae30916a50e0433104fcec4693