From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 19 Apr 2012 18:31:24 +0000 (+0200)
Subject: Merge branch 'merge-requests/105'
X-Git-Tag: v4.0.0beta~252
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3aeea0c196a70e08a5cd04db2dee1e4bdd367412;p=nextcloud-server.git

Merge branch 'merge-requests/105'
---

3aeea0c196a70e08a5cd04db2dee1e4bdd367412