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

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

5b3388c7c4c37492627700c38b385f31a397fb91