From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri, 12 Jul 2013 07:54:39 +0000 (+0200)
Subject: Merge branch 'master' into ext-fs-irods-master
X-Git-Tag: v6.0.0alpha2~423^2~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=481bb831bb898399a01495fb6d3b07ca44a02f17;p=nextcloud-server.git

Merge branch 'master' into ext-fs-irods-master
---

481bb831bb898399a01495fb6d3b07ca44a02f17