From: Florin Peter <github@florin-peter.de>
Date: Sat, 25 May 2013 18:37:28 +0000 (+0200)
Subject: Merge branch 'master' into fix_for_2377
X-Git-Tag: v6.0.0alpha2~701^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=adcafbde34b8f4c75dbf724e929766a1f7d964d4;p=nextcloud-server.git

Merge branch 'master' into fix_for_2377
---

adcafbde34b8f4c75dbf724e929766a1f7d964d4