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

Merge branch 'master' into interface
---

e6e14719c965d0f2b32dcb814e49939df1e7415c