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

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

6e2418141d7ef6a9b09f5a414aba52d0d5241efe