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

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

835f477d8fda0566e5a03a652a3b8005cb886389