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

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

5462e199d391a1e4c9858bfd8444366a1047fa7f