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

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

629faf6d343e7906322d125718f97d3ac2f9569b