From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri, 13 Sep 2013 21:31:59 +0000 (+0200)
Subject: Merge branch 'master' into appframework-master
X-Git-Tag: v6.0.0alpha2~121^2~25
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4480b0b16409c9c2f3fcca34afbd5bd5d2d2a6e2;p=nextcloud-server.git

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

4480b0b16409c9c2f3fcca34afbd5bd5d2d2a6e2