From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Tue, 8 Oct 2013 10:13:24 +0000 (+0200)
Subject: Merge branch 'master' into fixing-appframework-master
X-Git-Tag: v6.0.0beta2~103^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=053b55721d69a54b8d9460868d9e6f3edc606271;p=nextcloud-server.git

Merge branch 'master' into fixing-appframework-master
---

053b55721d69a54b8d9460868d9e6f3edc606271