From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Mon, 14 Oct 2013 22:09:00 +0000 (+0200)
Subject: Merge branch 'master' into coverage-on-windows-master
X-Git-Tag: v6.0.0beta2~97^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=86f6f0ca92cb1ea3be45ca45e9f72ec556003f58;p=nextcloud-server.git

Merge branch 'master' into coverage-on-windows-master
---

86f6f0ca92cb1ea3be45ca45e9f72ec556003f58