From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 26 Jul 2011 14:56:01 +0000 (+0200)
Subject: Merge branch 'master' into interface
X-Git-Tag: v3.0~267^2~364^2~21^2~32
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ede0cc1cfadd0f7d3dffd0a7a22baef08bb176fb;p=nextcloud-server.git

Merge branch 'master' into interface
---

ede0cc1cfadd0f7d3dffd0a7a22baef08bb176fb