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

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

a9d6b59307f703f186e32f716b73e014e594d495