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

Merge branch 'master' into interface
---

0accf2d64751a65b955600e9cd276726b8e8bdca