From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu, 18 Jul 2013 21:28:06 +0000 (+0200)
Subject: Merge branch 'master' into parallel-autotest.sh-master
X-Git-Tag: v6.0.0alpha2~419^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fdfb224d9782d153cdd6bc5a4dfcc7493d52de87;p=nextcloud-server.git

Merge branch 'master' into parallel-autotest.sh-master
---

fdfb224d9782d153cdd6bc5a4dfcc7493d52de87