From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 25 Apr 2012 07:23:01 +0000 (+0200)
Subject: Merge branch 'master' into movable_apps
X-Git-Tag: v4.0.0beta~168^2~20
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=60c0827ba386524efc133f3d91dc9bfdf40d1131;p=nextcloud-server.git

Merge branch 'master' into movable_apps
---

60c0827ba386524efc133f3d91dc9bfdf40d1131