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

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

a995e81686cd1255d8f43e13026f43d814dd64f4