From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 28 Jun 2013 07:22:48 +0000 (+0200)
Subject: Merge branch 'master' into ext-fs-irods-master
X-Git-Tag: v6.0.0alpha2~423^2~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e7d50617d7add1ac3bcd7ecfacf5dae76fea05b7;p=nextcloud-server.git

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

e7d50617d7add1ac3bcd7ecfacf5dae76fea05b7