From: root <roger.szabo@web.de>
Date: Mon, 25 Jul 2016 08:56:14 +0000 (+0800)
Subject: Merge branch 'master' of https://github.com/nextcloud/server
X-Git-Tag: v11.0RC2~933^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1fb080df2bd105ece36f32dba41f401167637a8b;p=nextcloud-server.git

Merge branch 'master' of https://github.com/nextcloud/server
---

1fb080df2bd105ece36f32dba41f401167637a8b