From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 15 Oct 2013 09:53:51 +0000 (+0200)
Subject: Merge branch 'master' into avater_with_encryption
X-Git-Tag: v6.0.0alpha2~1^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=25320f19df017947f31ea156ade061274b5bd691;p=nextcloud-server.git

Merge branch 'master' into avater_with_encryption
---

25320f19df017947f31ea156ade061274b5bd691