From: Robin Appelman <icewind1991@gmail.com>
Date: Sat, 23 Jul 2011 16:44:29 +0000 (+0200)
Subject: Merge branch 'master' into interface
X-Git-Tag: v3.0~267^2~364^2~21^2~36
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=de7c110225a7831e84c89b86cff459804583426f;p=nextcloud-server.git

Merge branch 'master' into interface
---

de7c110225a7831e84c89b86cff459804583426f