From: Florin Peter <github@florin-peter.de>
Date: Fri, 24 May 2013 17:40:23 +0000 (+0200)
Subject: Merge branch 'stable5' into files_encryption_stable5
X-Git-Tag: v5.0.7~46^2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e7734d0c46f153f12d08cbc68978fe37db6720f4;p=nextcloud-server.git

Merge branch 'stable5' into files_encryption_stable5
---

e7734d0c46f153f12d08cbc68978fe37db6720f4