From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Tue, 17 Sep 2013 07:39:45 +0000 (+0200)
Subject: Merge branch 'master' into appframework-master
X-Git-Tag: v6.0.0alpha2~121^2~18
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4cd0ee47a8a66e42d80789612b183dd5b165b36e;p=nextcloud-server.git

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

4cd0ee47a8a66e42d80789612b183dd5b165b36e