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

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

687ba053b7055900dc938da5b82b6d391b0b4318