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

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

ad82a56f79fa46fae0742d0647008025e32c3d2b